Skip to content

Commit 0d7f5d1

Browse files
authored
Merge pull request #7773 from chrahunt/refactor/move-legacy-resolver
Move legacy_resolve to resolution.legacy.resolver
2 parents 35181cd + 8362c20 commit 0d7f5d1

File tree

6 files changed

+5
-3
lines changed

6 files changed

+5
-3
lines changed

src/pip/_internal/cli/req_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from pip._internal.cli.command_context import CommandContextMixIn
1515
from pip._internal.exceptions import CommandError, PreviousBuildDirError
1616
from pip._internal.index.package_finder import PackageFinder
17-
from pip._internal.legacy_resolve import Resolver
1817
from pip._internal.models.selection_prefs import SelectionPreferences
1918
from pip._internal.network.download import Downloader
2019
from pip._internal.network.session import PipSession
@@ -27,6 +26,7 @@
2726
)
2827
from pip._internal.req.req_file import parse_requirements
2928
from pip._internal.req.req_set import RequirementSet
29+
from pip._internal.resolution.legacy.resolver import Resolver
3030
from pip._internal.self_outdated_check import (
3131
make_link_collector,
3232
pip_self_version_check,

src/pip/_internal/resolution/__init__.py

Whitespace-only changes.

src/pip/_internal/resolution/legacy/__init__.py

Whitespace-only changes.

tests/unit/test_req.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
InvalidWheelFilename,
1919
PreviousBuildDirError,
2020
)
21-
from pip._internal.legacy_resolve import Resolver
2221
from pip._internal.network.download import Downloader
2322
from pip._internal.network.session import PipSession
2423
from pip._internal.operations.prepare import RequirementPreparer
@@ -38,6 +37,7 @@
3837
handle_requirement_line,
3938
)
4039
from pip._internal.req.req_tracker import get_requirement_tracker
40+
from pip._internal.resolution.legacy.resolver import Resolver
4141
from pip._internal.utils.urls import path_to_url
4242
from tests.lib import assert_raises_regexp, make_test_finder, requirements_file
4343

tests/unit/test_legacy_resolve.py renamed to tests/unit/test_resolution_legacy_resolver.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
NoneMetadataError,
88
UnsupportedPythonVersion,
99
)
10-
from pip._internal.legacy_resolve import _check_dist_requires_python
10+
from pip._internal.resolution.legacy.resolver import (
11+
_check_dist_requires_python,
12+
)
1113
from pip._internal.utils.packaging import get_requires_python
1214

1315

0 commit comments

Comments
 (0)