Merge pull request #163 from sarugaku:separate-resolvers-modules

fix: separate resolvers into different modules

Author: frostming

examples/reporter_demo.py

@@ -1,9 +1,10 @@
 from collections import namedtuple
 
-import resolvelib
 from packaging.specifiers import SpecifierSet
 from packaging.version import Version
 
+import resolvelib
+
 index = """
 first 1.0.0
     second == 1.0.0

src/resolvelib/reporters.py

@@ -1,16 +1,11 @@
 from __future__ import annotations
 
-from typing import Generic
-
-from .structs import (
-    CT,
-    KT,
-    RT,
-    Collection,
-    Criterion,
-    RequirementInformation,
-    State,
-)
+from typing import TYPE_CHECKING, Collection, Generic
+
+from .structs import CT, KT, RT, RequirementInformation, State
+
+if TYPE_CHECKING:
+    from .resolvers.criterion import Criterion
 
 
 class BaseReporter(Generic[RT, CT, KT]):

src/resolvelib/resolvers/__init__.py

@@ -1,19 +1,20 @@
 from ..structs import RequirementInformation
 from .abstract import AbstractResolver, Result
-from .criterion import (
+from .exceptions import (
     InconsistentCandidate,
     RequirementsConflicted,
     ResolutionError,
     ResolutionImpossible,
     ResolutionTooDeep,
-    Resolver,
     ResolverException,
 )
+from .resolution import Resolution, Resolver
 
 __all__ = [
     "AbstractResolver",
     "InconsistentCandidate",
     "Resolver",
+    "Resolution",
     "RequirementsConflicted",
     "ResolutionError",
     "ResolutionImpossible",

src/resolvelib/resolvers/abstract.py

@@ -3,10 +3,10 @@
 import collections
 from typing import TYPE_CHECKING, Any, Generic, Iterable, Mapping, NamedTuple
 
-from resolvelib.providers import AbstractProvider
-from resolvelib.reporters import BaseReporter
-
-from ..structs import CT, KT, RT, Criterion, DirectedGraph
+from ..providers import AbstractProvider
+from ..reporters import BaseReporter
+from ..structs import CT, KT, RT, DirectedGraph
+from .criterion import Criterion
 
 if TYPE_CHECKING: