Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cruiz/commands/conaninvocation.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

from cruiz.settings.managers.generalpreferences import GeneralSettingsReader

from cruizlib.messagereplyprocessor import MessageReplyProcessor
from cruizlib.commands.messagereplyprocessor import MessageReplyProcessor

import psutil

Expand Down
4 changes: 2 additions & 2 deletions src/cruiz/commands/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@
from cruiz.settings.managers.namedlocalcache import NamedLocalCacheSettingsReader

import cruizlib.workers.api as workers_api
from cruizlib.commands.metarequestconaninvocation import MetaRequestConanInvocation
from cruizlib.constants import DEFAULT_CACHE_NAME
from cruizlib.exceptions import RecipeInspectionError
from cruizlib.interop.commandparameters import CommandParameters
from cruizlib.workers.metarequestconaninvocation import MetaRequestConanInvocation
from cruizlib.workers.utils.text2html import text_to_html

from .conanenv import get_conan_env
from .conaninvocation import ConanInvocation

if typing.TYPE_CHECKING:
from cruizlib.commands.conanconf import ConanConfigBoolean
from cruizlib.interop.packagebinaryparameters import PackageBinaryParameters
from cruizlib.interop.packageidparameters import PackageIdParameters
from cruizlib.interop.packagenode import PackageNode
Expand All @@ -35,7 +36,6 @@
from cruizlib.interop.reciperevisionsparameters import RecipeRevisionsParameters
from cruizlib.interop.searchrecipesparameters import SearchRecipesParameters

from .conanconf import ConanConfigBoolean
from .logdetails import LogDetails

logger = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion src/cruiz/manage_local_cache/managelocalcachesdialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

from PySide6 import QtCore, QtGui, QtWidgets

from cruiz.commands.conanconf import ConanConfigBoolean
from cruiz.commands.context import ConanContext
from cruiz.commands.logdetails import LogDetails
from cruiz.pyside6.local_cache_manage import Ui_ManageLocalCaches
Expand All @@ -33,6 +32,7 @@
from cruiz.widgets.util import BlockSignals

import cruizlib.globals
from cruizlib.commands.conanconf import ConanConfigBoolean
from cruizlib.constants import DEFAULT_CACHE_NAME
from cruizlib.interop.pod import ConanHook

Expand Down
2 changes: 1 addition & 1 deletion src/cruiz/remote_browser/pages/packagereferencepage.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

from PySide6 import QtCore, QtGui, QtWidgets

from cruiz.commands.conanconf import ConanConfigBoolean
from cruiz.settings.managers.namedlocalcache import AllNamedLocalCacheSettingsReader
from cruiz.widgets.util import BlockSignals

import cruizlib.globals
from cruizlib.commands.conanconf import ConanConfigBoolean
from cruizlib.interop.searchrecipesparameters import SearchRecipesParameters

from .page import Page
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@
logger = logging.getLogger(__name__)


# needed for coverage to record from a QThread
# see https://github.com/coveragepy/coveragepy/issues/686
def coverage_resolve_trace(fn: typing.Any) -> typing.Any:
"""."""
"""
Allow measuring coverage of a QThread function.

See https://github.com/coveragepy/coveragepy/issues/686
"""

@functools.wraps(fn)
def _wrapped( # pragma: no cover
Expand Down
2 changes: 1 addition & 1 deletion tests/ttypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

from PySide6 import QtCore

from cruizlib.commands.messagereplyprocessor import MessageReplyProcessor
from cruizlib.interop.commandparameters import CommandParameters
from cruizlib.interop.message import Message
from cruizlib.interop.packagebinaryparameters import PackageBinaryParameters
from cruizlib.interop.packageidparameters import PackageIdParameters
from cruizlib.interop.packagerevisionsparameters import PackageRevisionsParameters
from cruizlib.interop.reciperevisionsparameters import RecipeRevisionsParameters
from cruizlib.interop.searchrecipesparameters import SearchRecipesParameters
from cruizlib.messagereplyprocessor import MessageReplyProcessor
from cruizlib.multiprocessingmessagequeuetype import (
MultiProcessingMessageQueueType,
MultiProcessingStringJoinableQueueType,
Expand Down
4 changes: 2 additions & 2 deletions tests/workers/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
from PySide6 import QtCore

import cruizlib.workers.api as workers_api
from cruizlib.commands.messagereplyprocessor import MessageReplyProcessor
from cruizlib.commands.metarequestconaninvocation import MetaRequestConanInvocation
from cruizlib.globals import CONAN_MAJOR_VERSION, CONAN_VERSION_COMPONENTS
from cruizlib.interop.commandparameters import CommandParameters
from cruizlib.interop.message import (
Expand All @@ -28,8 +30,6 @@
Stdout,
Success,
)
from cruizlib.messagereplyprocessor import MessageReplyProcessor
from cruizlib.workers.metarequestconaninvocation import MetaRequestConanInvocation

# pylint: disable=wrong-import-order
import pytest
Expand Down
2 changes: 1 addition & 1 deletion tests/workers/test_meta_cruiz.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
if typing.TYPE_CHECKING:
from unittest.mock import MagicMock

from cruizlib.workers.metarequestconaninvocation import MetaRequestConanInvocation
from cruizlib.commands.metarequestconaninvocation import MetaRequestConanInvocation


def test_meta_get_version(
Expand Down