Move Resolver to a legacy_resolve module

src/pip/_internal/commands/download.py

@@ -5,10 +5,10 @@
 
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.base_command import RequirementCommand
+from pip._internal.legacy_resolve import Resolver
 from pip._internal.operations.prepare import RequirementPreparer
 from pip._internal.req import RequirementSet
 from pip._internal.req.req_tracker import RequirementTracker
-from pip._internal.resolve import Resolver
 from pip._internal.utils.filesystem import check_path_owner
 from pip._internal.utils.misc import ensure_dir, normalize_path
 from pip._internal.utils.temp_dir import TempDirectory

src/pip/_internal/commands/install.py

@@ -16,12 +16,12 @@
 from pip._internal.exceptions import (
     CommandError, InstallationError, PreviousBuildDirError,
 )
+from pip._internal.legacy_resolve import Resolver
 from pip._internal.locations import distutils_scheme, virtualenv_no_global
 from pip._internal.operations.check import check_install_conflicts
 from pip._internal.operations.prepare import RequirementPreparer
 from pip._internal.req import RequirementSet, install_given_reqs
 from pip._internal.req.req_tracker import RequirementTracker
-from pip._internal.resolve import Resolver
 from pip._internal.utils.filesystem import check_path_owner
 from pip._internal.utils.misc import (
     ensure_dir, get_installed_version,

src/pip/_internal/commands/wheel.py

@@ -8,10 +8,10 @@
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.base_command import RequirementCommand
 from pip._internal.exceptions import CommandError, PreviousBuildDirError
+from pip._internal.legacy_resolve import Resolver
 from pip._internal.operations.prepare import RequirementPreparer
 from pip._internal.req import RequirementSet
 from pip._internal.req.req_tracker import RequirementTracker
-from pip._internal.resolve import Resolver
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.wheel import WheelBuilder
 

tests/unit/test_req.py

@@ -15,14 +15,14 @@
     HashErrors, InstallationError, InvalidWheelFilename, PreviousBuildDirError,
 )
 from pip._internal.index import PackageFinder
+from pip._internal.legacy_resolve import Resolver
 from pip._internal.operations.prepare import RequirementPreparer
 from pip._internal.req import InstallRequirement, RequirementSet
 from pip._internal.req.constructors import (
     install_req_from_editable, install_req_from_line, parse_editable,
 )
 from pip._internal.req.req_file import process_line
 from pip._internal.req.req_tracker import RequirementTracker
-from pip._internal.resolve import Resolver
 from tests.lib import DATA_DIR, assert_raises_regexp, requirements_file
 
 

tests/unit/test_resolve.py

@@ -4,7 +4,7 @@
 from mock import patch
 
 from pip._internal.exceptions import UnsupportedPythonVersion
-from pip._internal.resolve import _check_dist_requires_python
+from pip._internal.legacy_resolve import _check_dist_requires_python
 
 
 class FakeDist(object):
@@ -18,7 +18,7 @@ def dist():
     return FakeDist('my-project')
 
 
-@patch('pip._internal.resolve.get_requires_python')
+@patch('pip._internal.legacy_resolve.get_requires_python')
 class TestCheckDistRequiresPython(object):
 
     """