diff options
Diffstat (limited to 'src/pip/_internal/resolution/resolvelib/base.py')
| -rw-r--r-- | src/pip/_internal/resolution/resolvelib/base.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/pip/_internal/resolution/resolvelib/base.py b/src/pip/_internal/resolution/resolvelib/base.py index 81fee9b9e..0295b0ed8 100644 --- a/src/pip/_internal/resolution/resolvelib/base.py +++ b/src/pip/_internal/resolution/resolvelib/base.py @@ -1,14 +1,15 @@ -from typing import FrozenSet, Iterable, Optional, Tuple +from typing import FrozenSet, Iterable, Optional, Tuple, Union from pip._vendor.packaging.specifiers import SpecifierSet -from pip._vendor.packaging.utils import canonicalize_name -from pip._vendor.packaging.version import _BaseVersion +from pip._vendor.packaging.utils import NormalizedName, canonicalize_name +from pip._vendor.packaging.version import LegacyVersion, Version from pip._internal.models.link import Link from pip._internal.req.req_install import InstallRequirement from pip._internal.utils.hashes import Hashes CandidateLookup = Tuple[Optional["Candidate"], Optional[InstallRequirement]] +CandidateVersion = Union[LegacyVersion, Version] def format_name(project, extras): @@ -62,7 +63,7 @@ class Constraint: class Requirement: @property def project_name(self): - # type: () -> str + # type: () -> NormalizedName """The "project name" of a requirement. This is different from ``name`` if this requirement contains extras, @@ -97,7 +98,7 @@ class Requirement: class Candidate: @property def project_name(self): - # type: () -> str + # type: () -> NormalizedName """The "project name" of the candidate. This is different from ``name`` if this candidate contains extras, @@ -118,7 +119,7 @@ class Candidate: @property def version(self): - # type: () -> _BaseVersion + # type: () -> CandidateVersion raise NotImplementedError("Override in subclass") @property |