mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Move Resolver to a legacy_resolve module
This commit is contained in:
parent
77da032c91
commit
b05c66722e
6 changed files with 6 additions and 6 deletions
|
@ -5,10 +5,10 @@ import os
|
|||
|
||||
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
|
||||
|
|
|
@ -16,12 +16,12 @@ from pip._internal.cli.status_codes import ERROR
|
|||
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,
|
||||
|
|
|
@ -8,10 +8,10 @@ from pip._internal.cache import WheelCache
|
|||
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
|
||||
|
||||
|
|
|
@ -15,6 +15,7 @@ from pip._internal.exceptions import (
|
|||
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 (
|
||||
|
@ -22,7 +23,6 @@ from pip._internal.req.constructors import (
|
|||
)
|
||||
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
|
||||
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ import pytest
|
|||
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):
|
||||
|
||||
"""
|
||||
|
|
Loading…
Reference in a new issue