Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: separate resolvers into different modules #163

Merged
merged 2 commits into from
Aug 1, 2024
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
3 changes: 2 additions & 1 deletion examples/reporter_demo.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
17 changes: 6 additions & 11 deletions src/resolvelib/reporters.py
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
5 changes: 3 additions & 2 deletions src/resolvelib/resolvers/__init__.py
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
8 changes: 4 additions & 4 deletions src/resolvelib/resolvers/abstract.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Loading
Loading