diff --git a/pyproject.toml b/pyproject.toml index 23830a24881..e0c053dc9c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -153,7 +153,6 @@ distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt" [tool.ruff] # Pinned to delay pyupgrade changes (https://github.com/pypa/pip/issues/13236) target-version = "py38" # Pin Ruff to Python 3.8 -src = ["src"] line-length = 88 extend-exclude = [ "_vendor", diff --git a/tests/conftest.py b/tests/conftest.py index d093eea462b..0066f48348b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -43,7 +43,6 @@ from installer import install from installer.destinations import SchemeDictionaryDestination from installer.sources import WheelFile - from pip import __file__ as pip_location from pip._internal.locations import _USE_SYSCONFIG from pip._internal.utils.temp_dir import global_tempdir_manager diff --git a/tests/functional/test_build_env.py b/tests/functional/test_build_env.py index c950a8a6de9..3ebc62624d1 100644 --- a/tests/functional/test_build_env.py +++ b/tests/functional/test_build_env.py @@ -4,7 +4,6 @@ from typing import Optional import pytest - from pip._internal.build_env import BuildEnvironment, _get_system_sitepackages from tests.lib import ( diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py index 366d0129b2d..39f2d92c47c 100644 --- a/tests/functional/test_cli.py +++ b/tests/functional/test_cli.py @@ -6,7 +6,6 @@ from textwrap import dedent import pytest - from pip._internal.commands import commands_dict from tests.lib import PipTestEnvironment diff --git a/tests/functional/test_debug.py b/tests/functional/test_debug.py index 82557299904..15fcc709d79 100644 --- a/tests/functional/test_debug.py +++ b/tests/functional/test_debug.py @@ -2,12 +2,11 @@ from typing import List import pytest - -from pip._vendor.packaging.version import Version - from pip._internal.commands.debug import create_vendor_txt_map from pip._internal.utils import compatibility_tags +from pip._vendor.packaging.version import Version + from tests.lib import PipTestEnvironment diff --git a/tests/functional/test_download.py b/tests/functional/test_download.py index 3906885a19b..f9276a1bcf0 100644 --- a/tests/functional/test_download.py +++ b/tests/functional/test_download.py @@ -8,7 +8,6 @@ from typing import Callable, List, Tuple import pytest - from pip._internal.cli.status_codes import ERROR from pip._internal.utils.urls import path_to_url diff --git a/tests/functional/test_fast_deps.py b/tests/functional/test_fast_deps.py index 85c9bbd7072..30a9bd79e72 100644 --- a/tests/functional/test_fast_deps.py +++ b/tests/functional/test_fast_deps.py @@ -7,11 +7,10 @@ from typing import Iterable import pytest +from pip._internal.utils.misc import hash_file from pip._vendor.packaging.utils import canonicalize_name -from pip._internal.utils.misc import hash_file - from tests.lib import PipTestEnvironment, TestData, TestPipResult diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py index 0a7cedd11cb..4c285bae252 100644 --- a/tests/functional/test_freeze.py +++ b/tests/functional/test_freeze.py @@ -6,11 +6,10 @@ from pathlib import Path import pytest +from pip._internal.models.direct_url import DirectUrl, DirInfo from pip._vendor.packaging.utils import canonicalize_name -from pip._internal.models.direct_url import DirectUrl, DirInfo - from tests.lib import ( PipTestEnvironment, TestData, diff --git a/tests/functional/test_help.py b/tests/functional/test_help.py index cba036927c8..0bce6aa0314 100644 --- a/tests/functional/test_help.py +++ b/tests/functional/test_help.py @@ -1,7 +1,6 @@ from unittest.mock import Mock import pytest - from pip._internal.cli.status_codes import ERROR, SUCCESS from pip._internal.commands import commands_dict, create_command from pip._internal.exceptions import CommandError diff --git a/tests/functional/test_index.py b/tests/functional/test_index.py index b58ad4a50d6..ce97bb09f2b 100644 --- a/tests/functional/test_index.py +++ b/tests/functional/test_index.py @@ -1,7 +1,6 @@ import json import pytest - from pip._internal.cli.status_codes import ERROR, SUCCESS from pip._internal.commands import create_command diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index 1dc46cf8621..705544302b9 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -12,7 +12,6 @@ from typing import Dict, Iterable, List, Optional, Tuple import pytest - from pip._internal.cli.status_codes import ERROR, SUCCESS from pip._internal.models.index import PyPI, TestPyPI from pip._internal.utils.misc import rmtree diff --git a/tests/functional/test_install_direct_url.py b/tests/functional/test_install_direct_url.py index 5aefab09cb3..054ae5662c4 100644 --- a/tests/functional/test_install_direct_url.py +++ b/tests/functional/test_install_direct_url.py @@ -1,5 +1,4 @@ import pytest - from pip._internal.models.direct_url import VcsInfo from tests.lib import PipTestEnvironment, TestData, _create_test_package diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py index 6349036bf52..8d3558356c7 100644 --- a/tests/functional/test_invalid_versions_and_specifiers.py +++ b/tests/functional/test_invalid_versions_and_specifiers.py @@ -1,7 +1,6 @@ import zipfile import pytest - from pip._internal.metadata import select_backend from tests.lib import PipTestEnvironment, TestData diff --git a/tests/functional/test_list.py b/tests/functional/test_list.py index 468e6acd6c2..298022e65be 100644 --- a/tests/functional/test_list.py +++ b/tests/functional/test_list.py @@ -3,7 +3,6 @@ from pathlib import Path import pytest - from pip._internal.models.direct_url import DirectUrl, DirInfo from tests.lib import ( diff --git a/tests/functional/test_new_resolver_target.py b/tests/functional/test_new_resolver_target.py index 58b2d548b65..fec6f5d02c7 100644 --- a/tests/functional/test_new_resolver_target.py +++ b/tests/functional/test_new_resolver_target.py @@ -2,7 +2,6 @@ from typing import Callable, Optional import pytest - from pip._internal.cli.status_codes import ERROR, SUCCESS from tests.lib import PipTestEnvironment diff --git a/tests/functional/test_pep517.py b/tests/functional/test_pep517.py index 34ddd6633ce..54a3f8b405e 100644 --- a/tests/functional/test_pep517.py +++ b/tests/functional/test_pep517.py @@ -4,7 +4,6 @@ import pytest import tomli_w - from pip._internal.build_env import BuildEnvironment from pip._internal.req import InstallRequirement diff --git a/tests/functional/test_search.py b/tests/functional/test_search.py index 9491b492400..c5b1a93c36b 100644 --- a/tests/functional/test_search.py +++ b/tests/functional/test_search.py @@ -3,7 +3,6 @@ from unittest import mock import pytest - from pip._internal.cli.status_codes import NO_MATCHES_FOUND, SUCCESS from pip._internal.commands import create_command from pip._internal.commands.search import highest_version, print_results, transform_hits diff --git a/tests/functional/test_show.py b/tests/functional/test_show.py index ea831935372..112cc297ee6 100644 --- a/tests/functional/test_show.py +++ b/tests/functional/test_show.py @@ -4,7 +4,6 @@ import textwrap import pytest - from pip import __version__ from pip._internal.commands.show import search_packages_info from pip._internal.utils.unpacking import untar_file diff --git a/tests/functional/test_uninstall.py b/tests/functional/test_uninstall.py index d86ba172002..5c359b6d416 100644 --- a/tests/functional/test_uninstall.py +++ b/tests/functional/test_uninstall.py @@ -9,7 +9,6 @@ from unittest.mock import Mock import pytest - from pip._internal.req.constructors import install_req_from_line from pip._internal.utils.misc import rmtree diff --git a/tests/functional/test_vcs_bazaar.py b/tests/functional/test_vcs_bazaar.py index 821427ed841..451861932e0 100644 --- a/tests/functional/test_vcs_bazaar.py +++ b/tests/functional/test_vcs_bazaar.py @@ -7,7 +7,6 @@ from pathlib import Path import pytest - from pip._internal.vcs.bazaar import Bazaar from pip._internal.vcs.versioncontrol import RemoteNotFoundError diff --git a/tests/functional/test_vcs_git.py b/tests/functional/test_vcs_git.py index f917fa8b39e..71ff28e6599 100644 --- a/tests/functional/test_vcs_git.py +++ b/tests/functional/test_vcs_git.py @@ -9,7 +9,6 @@ from unittest.mock import Mock, patch import pytest - from pip._internal.utils.misc import HiddenText from pip._internal.vcs import vcs from pip._internal.vcs.git import Git, RemoteNotFoundError diff --git a/tests/functional/test_vcs_subversion.py b/tests/functional/test_vcs_subversion.py index 987f481edd4..8409832d815 100644 --- a/tests/functional/test_vcs_subversion.py +++ b/tests/functional/test_vcs_subversion.py @@ -1,7 +1,6 @@ from pathlib import Path import pytest - from pip._internal.vcs.subversion import Subversion from pip._internal.vcs.versioncontrol import RemoteNotFoundError diff --git a/tests/functional/test_wheel.py b/tests/functional/test_wheel.py index e1ede880496..f2198f19287 100644 --- a/tests/functional/test_wheel.py +++ b/tests/functional/test_wheel.py @@ -7,7 +7,6 @@ from pathlib import Path import pytest - from pip._internal.cli.status_codes import ERROR from tests.lib import ( diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index 44fa4053b73..a047b39b935 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -33,10 +33,6 @@ from zipfile import ZipFile import pytest -from scripttest import FoundDir, FoundFile, ProcResult, TestFileEnvironment - -from pip._vendor.packaging.utils import canonicalize_name - from pip._internal.cli.main import main as pip_entry_point from pip._internal.index.collector import LinkCollector from pip._internal.index.package_finder import PackageFinder @@ -46,6 +42,9 @@ from pip._internal.models.target_python import TargetPython from pip._internal.network.session import PipSession from pip._internal.utils.egg_link import _egg_link_names +from scripttest import FoundDir, FoundFile, ProcResult, TestFileEnvironment + +from pip._vendor.packaging.utils import canonicalize_name from tests.lib.venv import VirtualEnvironment from tests.lib.wheel import make_wheel diff --git a/tests/lib/wheel.py b/tests/lib/wheel.py index 43b382919f6..6110c14ea2f 100644 --- a/tests/lib/wheel.py +++ b/tests/lib/wheel.py @@ -24,10 +24,10 @@ ) from zipfile import ZipFile -from pip._vendor.requests.structures import CaseInsensitiveDict - from pip._internal.metadata import BaseDistribution, MemoryWheel, get_wheel_distribution +from pip._vendor.requests.structures import CaseInsensitiveDict + # As would be used in metadata HeaderValue = Union[str, List[str]] diff --git a/tests/unit/metadata/test_metadata.py b/tests/unit/metadata/test_metadata.py index 404d858bdd5..885ba51df44 100644 --- a/tests/unit/metadata/test_metadata.py +++ b/tests/unit/metadata/test_metadata.py @@ -5,9 +5,6 @@ from unittest import mock import pytest - -from pip._vendor.packaging.utils import NormalizedName - from pip._internal.metadata import ( BaseDistribution, get_directory_distribution, @@ -17,6 +14,8 @@ from pip._internal.metadata.base import FilesystemWheel from pip._internal.models.direct_url import DIRECT_URL_METADATA_NAME, ArchiveInfo +from pip._vendor.packaging.utils import NormalizedName + from tests.lib.wheel import make_wheel diff --git a/tests/unit/metadata/test_metadata_pkg_resources.py b/tests/unit/metadata/test_metadata_pkg_resources.py index 6b3a302fb3c..c9cd7781360 100644 --- a/tests/unit/metadata/test_metadata_pkg_resources.py +++ b/tests/unit/metadata/test_metadata_pkg_resources.py @@ -4,12 +4,6 @@ from unittest import mock import pytest - -from pip._vendor.packaging.requirements import Requirement -from pip._vendor.packaging.specifiers import SpecifierSet -from pip._vendor.packaging.utils import canonicalize_name -from pip._vendor.packaging.version import parse as parse_version - from pip._internal.exceptions import UnsupportedWheel from pip._internal.metadata.pkg_resources import ( Distribution, @@ -17,6 +11,11 @@ InMemoryMetadata, ) +from pip._vendor.packaging.requirements import Requirement +from pip._vendor.packaging.specifiers import SpecifierSet +from pip._vendor.packaging.utils import canonicalize_name +from pip._vendor.packaging.version import parse as parse_version + pkg_resources = pytest.importorskip("pip._vendor.pkg_resources") diff --git a/tests/unit/resolution_resolvelib/conftest.py b/tests/unit/resolution_resolvelib/conftest.py index 6aa5f505dbb..1b45d6235ff 100644 --- a/tests/unit/resolution_resolvelib/conftest.py +++ b/tests/unit/resolution_resolvelib/conftest.py @@ -1,7 +1,6 @@ from typing import Iterator import pytest - from pip._internal.cli.req_command import RequirementCommand from pip._internal.commands.install import InstallCommand from pip._internal.index.collector import LinkCollector diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py index 690217e85ce..0bec497a3a3 100644 --- a/tests/unit/resolution_resolvelib/test_provider.py +++ b/tests/unit/resolution_resolvelib/test_provider.py @@ -2,9 +2,6 @@ from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Sequence import pytest - -from pip._vendor.resolvelib.resolvers import RequirementInformation - from pip._internal.req.constructors import install_req_from_req_string from pip._internal.resolution.resolvelib.base import Candidate from pip._internal.resolution.resolvelib.candidates import REQUIRES_PYTHON_IDENTIFIER @@ -12,11 +9,13 @@ from pip._internal.resolution.resolvelib.provider import PipProvider from pip._internal.resolution.resolvelib.requirements import SpecifierRequirement -if TYPE_CHECKING: - from pip._vendor.resolvelib.providers import Preference +from pip._vendor.resolvelib.resolvers import RequirementInformation +if TYPE_CHECKING: from pip._internal.resolution.resolvelib.base import Candidate, Requirement + from pip._vendor.resolvelib.providers import Preference + PreferenceInformation = RequirementInformation[Requirement, Candidate] diff --git a/tests/unit/resolution_resolvelib/test_requirement.py b/tests/unit/resolution_resolvelib/test_requirement.py index cde6256a206..78cdb9ebf46 100644 --- a/tests/unit/resolution_resolvelib/test_requirement.py +++ b/tests/unit/resolution_resolvelib/test_requirement.py @@ -3,13 +3,12 @@ from typing import List, Tuple import pytest - -from pip._vendor.resolvelib import BaseReporter, Resolver - from pip._internal.resolution.resolvelib.base import Candidate, Constraint, Requirement from pip._internal.resolution.resolvelib.factory import Factory from pip._internal.resolution.resolvelib.provider import PipProvider +from pip._vendor.resolvelib import BaseReporter, Resolver + from tests.lib import TestData # NOTE: All tests are prefixed `test_rlr` (for "test resolvelib resolver"). diff --git a/tests/unit/resolution_resolvelib/test_resolver.py b/tests/unit/resolution_resolvelib/test_resolver.py index 9a0e4c90825..dc92b515ea0 100644 --- a/tests/unit/resolution_resolvelib/test_resolver.py +++ b/tests/unit/resolution_resolvelib/test_resolver.py @@ -2,11 +2,6 @@ from unittest import mock import pytest - -from pip._vendor.packaging.utils import canonicalize_name -from pip._vendor.resolvelib.resolvers import Result -from pip._vendor.resolvelib.structs import DirectedGraph - from pip._internal.index.package_finder import PackageFinder from pip._internal.operations.prepare import RequirementPreparer from pip._internal.req.constructors import install_req_from_line @@ -16,6 +11,10 @@ get_topological_weights, ) +from pip._vendor.packaging.utils import canonicalize_name +from pip._vendor.resolvelib.resolvers import Result +from pip._vendor.resolvelib.structs import DirectedGraph + @pytest.fixture def resolver(preparer: RequirementPreparer, finder: PackageFinder) -> Resolver: diff --git a/tests/unit/test_appdirs.py b/tests/unit/test_appdirs.py index 51bd6828e2a..00fe1706cd6 100644 --- a/tests/unit/test_appdirs.py +++ b/tests/unit/test_appdirs.py @@ -5,11 +5,10 @@ from unittest import mock import pytest +from pip._internal.utils import appdirs from pip._vendor import platformdirs -from pip._internal.utils import appdirs - class TestUserCacheDir: @pytest.mark.skipif(sys.platform != "win32", reason="Windows-only test") diff --git a/tests/unit/test_base_command.py b/tests/unit/test_base_command.py index 33d2a95a3c2..9c85a3a90fd 100644 --- a/tests/unit/test_base_command.py +++ b/tests/unit/test_base_command.py @@ -7,7 +7,6 @@ from unittest.mock import Mock, patch import pytest - from pip._internal.cli.base_command import Command from pip._internal.cli.status_codes import SUCCESS from pip._internal.utils import temp_dir diff --git a/tests/unit/test_cache.py b/tests/unit/test_cache.py index 30cdb6ebece..ef6513336a7 100644 --- a/tests/unit/test_cache.py +++ b/tests/unit/test_cache.py @@ -1,12 +1,12 @@ import os from pathlib import Path -from pip._vendor.packaging.tags import Tag, interpreter_name, interpreter_version - from pip._internal.cache import WheelCache, _hash_dict from pip._internal.models.link import Link from pip._internal.utils.misc import ensure_dir +from pip._vendor.packaging.tags import Tag, interpreter_name, interpreter_version + def test_falsey_path_none() -> None: wc = WheelCache("") diff --git a/tests/unit/test_cmdoptions.py b/tests/unit/test_cmdoptions.py index 8c33ca8c18d..09c3e050f2f 100644 --- a/tests/unit/test_cmdoptions.py +++ b/tests/unit/test_cmdoptions.py @@ -4,7 +4,6 @@ from venv import EnvBuilder import pytest - from pip._internal.cli.cmdoptions import _convert_python_version from pip._internal.cli.main_parser import identify_python_interpreter diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py index c7760a238f2..a17065f1273 100644 --- a/tests/unit/test_collector.py +++ b/tests/unit/test_collector.py @@ -10,10 +10,6 @@ from unittest import mock import pytest - -from pip._vendor import requests -from pip._vendor.packaging.requirements import Requirement - from pip._internal.exceptions import NetworkConnectionError from pip._internal.index.collector import ( IndexContent, @@ -37,6 +33,9 @@ ) from pip._internal.network.session import PipSession +from pip._vendor import requests +from pip._vendor.packaging.requirements import Requirement + from tests.lib import ( TestData, make_test_link_collector, diff --git a/tests/unit/test_command_install.py b/tests/unit/test_command_install.py index 5e7889fe16b..036bee3e49d 100644 --- a/tests/unit/test_command_install.py +++ b/tests/unit/test_command_install.py @@ -2,7 +2,6 @@ from unittest import mock import pytest - from pip._internal.commands import install from pip._internal.commands.install import create_os_error_message, decide_user_install diff --git a/tests/unit/test_commands.py b/tests/unit/test_commands.py index 9d5aefec298..8fa329737ac 100644 --- a/tests/unit/test_commands.py +++ b/tests/unit/test_commands.py @@ -3,7 +3,6 @@ from unittest import mock import pytest - from pip._internal.cli.base_command import Command from pip._internal.cli.req_command import ( IndexGroupCommand, diff --git a/tests/unit/test_compat.py b/tests/unit/test_compat.py index b7f46ca9000..10458f6cf40 100644 --- a/tests/unit/test_compat.py +++ b/tests/unit/test_compat.py @@ -2,7 +2,6 @@ from pathlib import Path import pytest - from pip._internal.utils.compat import get_path_uid diff --git a/tests/unit/test_configuration.py b/tests/unit/test_configuration.py index 73b7d68c399..381bce39c65 100644 --- a/tests/unit/test_configuration.py +++ b/tests/unit/test_configuration.py @@ -4,7 +4,6 @@ from unittest.mock import MagicMock import pytest - from pip._internal.configuration import get_configuration_files, kinds from pip._internal.exceptions import ConfigurationError diff --git a/tests/unit/test_direct_url.py b/tests/unit/test_direct_url.py index 151e0a30f5b..8eb346d5f71 100644 --- a/tests/unit/test_direct_url.py +++ b/tests/unit/test_direct_url.py @@ -1,5 +1,4 @@ import pytest - from pip._internal.models.direct_url import ( ArchiveInfo, DirectUrl, diff --git a/tests/unit/test_exceptions.py b/tests/unit/test_exceptions.py index 90a44348f0a..c5913e4cd91 100644 --- a/tests/unit/test_exceptions.py +++ b/tests/unit/test_exceptions.py @@ -9,11 +9,10 @@ from typing import Optional, Tuple import pytest +from pip._internal.exceptions import DiagnosticPipError, ExternallyManagedEnvironment from pip._vendor import rich -from pip._internal.exceptions import DiagnosticPipError, ExternallyManagedEnvironment - class TestDiagnosticPipErrorCreation: def test_fails_without_reference(self) -> None: diff --git a/tests/unit/test_finder.py b/tests/unit/test_finder.py index 8c923dcd36f..e8d6711d37f 100644 --- a/tests/unit/test_finder.py +++ b/tests/unit/test_finder.py @@ -2,13 +2,8 @@ from typing import Iterable from unittest.mock import Mock, patch -import pytest - -from pip._vendor.packaging.specifiers import SpecifierSet -from pip._vendor.packaging.tags import Tag -from pip._vendor.packaging.version import parse as parse_version - import pip._internal.utils.compatibility_tags +import pytest from pip._internal.exceptions import BestVersionAlreadyInstalled, DistributionNotFound from pip._internal.index.package_finder import ( CandidateEvaluator, @@ -20,6 +15,10 @@ from pip._internal.models.target_python import TargetPython from pip._internal.req.constructors import install_req_from_line +from pip._vendor.packaging.specifiers import SpecifierSet +from pip._vendor.packaging.tags import Tag +from pip._vendor.packaging.version import parse as parse_version + from tests.lib import TestData, make_test_finder diff --git a/tests/unit/test_format_control.py b/tests/unit/test_format_control.py index 33a03729db5..d00aee983a2 100644 --- a/tests/unit/test_format_control.py +++ b/tests/unit/test_format_control.py @@ -2,7 +2,6 @@ from typing import FrozenSet, List, Set import pytest - from pip._internal.cli import cmdoptions from pip._internal.cli.base_command import Command from pip._internal.cli.status_codes import SUCCESS diff --git a/tests/unit/test_index.py b/tests/unit/test_index.py index cbbca03817e..589a268461f 100644 --- a/tests/unit/test_index.py +++ b/tests/unit/test_index.py @@ -2,10 +2,6 @@ from typing import FrozenSet, List, Optional, Set, Tuple import pytest - -from pip._vendor.packaging.specifiers import SpecifierSet -from pip._vendor.packaging.tags import Tag - from pip._internal.index.collector import LinkCollector from pip._internal.index.package_finder import ( CandidateEvaluator, @@ -27,6 +23,9 @@ from pip._internal.utils.compatibility_tags import get_supported from pip._internal.utils.hashes import Hashes +from pip._vendor.packaging.specifiers import SpecifierSet +from pip._vendor.packaging.tags import Tag + from tests.lib import CURRENT_PY_VERSION_INFO from tests.lib.index import make_mock_candidate diff --git a/tests/unit/test_link.py b/tests/unit/test_link.py index a379d877b2c..bc6b9a8d648 100644 --- a/tests/unit/test_link.py +++ b/tests/unit/test_link.py @@ -1,7 +1,6 @@ from typing import Optional import pytest - from pip._internal.models.link import Link, links_equivalent from pip._internal.utils.hashes import Hashes diff --git a/tests/unit/test_locations.py b/tests/unit/test_locations.py index 884e0dd51e2..2f4a9806a88 100644 --- a/tests/unit/test_locations.py +++ b/tests/unit/test_locations.py @@ -14,7 +14,6 @@ from unittest.mock import Mock import pytest - from pip._internal.locations import SCHEME_KEYS, _should_use_sysconfig, get_scheme if sys.platform == "win32": diff --git a/tests/unit/test_logging.py b/tests/unit/test_logging.py index a227bd67fa2..dc372139899 100644 --- a/tests/unit/test_logging.py +++ b/tests/unit/test_logging.py @@ -6,7 +6,6 @@ from unittest.mock import patch import pytest - from pip._internal.utils.logging import ( BrokenStdoutLoggingError, IndentingFormatter, diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py index c09314e50cf..a835372223f 100644 --- a/tests/unit/test_models.py +++ b/tests/unit/test_models.py @@ -1,10 +1,10 @@ """Tests for various classes in pip._internal.models""" -from pip._vendor.packaging.version import parse as parse_version - from pip._internal.models import candidate, index from pip._internal.models.link import Link +from pip._vendor.packaging.version import parse as parse_version + class TestPackageIndex: """Tests for pip._internal.models.index.PackageIndex""" diff --git a/tests/unit/test_models_wheel.py b/tests/unit/test_models_wheel.py index 46991e3487b..26fe61d6a78 100644 --- a/tests/unit/test_models_wheel.py +++ b/tests/unit/test_models_wheel.py @@ -1,11 +1,10 @@ import pytest - -from pip._vendor.packaging.tags import Tag - from pip._internal.exceptions import InvalidWheelFilename from pip._internal.models.wheel import Wheel from pip._internal.utils import compatibility_tags, deprecation +from pip._vendor.packaging.tags import Tag + class TestWheelFile: def test_std_wheel_pattern(self) -> None: diff --git a/tests/unit/test_network_auth.py b/tests/unit/test_network_auth.py index aec5e513ba5..537360fe41d 100644 --- a/tests/unit/test_network_auth.py +++ b/tests/unit/test_network_auth.py @@ -4,9 +4,8 @@ import sys from typing import Any, Dict, Iterable, List, Optional, Tuple -import pytest - import pip._internal.network.auth +import pytest from pip._internal.network.auth import MultiDomainBasicAuth from tests.lib.requests_mocks import MockConnection, MockRequest, MockResponse diff --git a/tests/unit/test_network_cache.py b/tests/unit/test_network_cache.py index af15acae450..4dfe7abace9 100644 --- a/tests/unit/test_network_cache.py +++ b/tests/unit/test_network_cache.py @@ -3,11 +3,10 @@ from unittest.mock import Mock import pytest +from pip._internal.network.cache import SafeFileCache from pip._vendor.cachecontrol.caches import FileCache -from pip._internal.network.cache import SafeFileCache - from tests.lib.filesystem import chmod diff --git a/tests/unit/test_network_download.py b/tests/unit/test_network_download.py index 14998d229bf..91652a16caf 100644 --- a/tests/unit/test_network_download.py +++ b/tests/unit/test_network_download.py @@ -3,7 +3,6 @@ from typing import Dict import pytest - from pip._internal.models.link import Link from pip._internal.network.download import ( _prepare_download, diff --git a/tests/unit/test_network_lazy_wheel.py b/tests/unit/test_network_lazy_wheel.py index 5d97e9e3202..502687ea92e 100644 --- a/tests/unit/test_network_lazy_wheel.py +++ b/tests/unit/test_network_lazy_wheel.py @@ -1,9 +1,6 @@ from typing import Iterator import pytest - -from pip._vendor.packaging.version import Version - from pip._internal.exceptions import InvalidWheel from pip._internal.network.lazy_wheel import ( HTTPRangeRequestUnsupported, @@ -11,6 +8,8 @@ ) from pip._internal.network.session import PipSession +from pip._vendor.packaging.version import Version + from tests.lib import TestData from tests.lib.server import MockServer, file_response diff --git a/tests/unit/test_network_session.py b/tests/unit/test_network_session.py index fd00d5c606c..cde6f1ef8af 100644 --- a/tests/unit/test_network_session.py +++ b/tests/unit/test_network_session.py @@ -6,9 +6,6 @@ from urllib.request import getproxies import pytest - -from pip._vendor import requests - from pip import __version__ from pip._internal.models.link import Link from pip._internal.network.session import ( @@ -17,6 +14,8 @@ user_agent, ) +from pip._vendor import requests + def get_user_agent() -> str: # These tests are testing the computation of the user agent, so we want to diff --git a/tests/unit/test_network_utils.py b/tests/unit/test_network_utils.py index 5911583feec..409fdc23faa 100644 --- a/tests/unit/test_network_utils.py +++ b/tests/unit/test_network_utils.py @@ -1,5 +1,4 @@ import pytest - from pip._internal.exceptions import NetworkConnectionError from pip._internal.network.utils import raise_for_status diff --git a/tests/unit/test_operations_prepare.py b/tests/unit/test_operations_prepare.py index 86e26c11801..7fd4b0ceab3 100644 --- a/tests/unit/test_operations_prepare.py +++ b/tests/unit/test_operations_prepare.py @@ -7,7 +7,6 @@ from unittest.mock import Mock, patch import pytest - from pip._internal.exceptions import HashMismatch from pip._internal.models.link import Link from pip._internal.network.download import Downloader diff --git a/tests/unit/test_options.py b/tests/unit/test_options.py index 8f3cf7de6a6..7d4316dbd23 100644 --- a/tests/unit/test_options.py +++ b/tests/unit/test_options.py @@ -4,9 +4,8 @@ from tempfile import NamedTemporaryFile from typing import Any, Dict, Iterator, List, Tuple, Type, Union, cast -import pytest - import pip._internal.configuration +import pytest from pip._internal.cli.main import main from pip._internal.commands import create_command from pip._internal.commands.configuration import ConfigurationCommand diff --git a/tests/unit/test_packaging.py b/tests/unit/test_packaging.py index 6b8c4cd37d8..a08aa2d3b1c 100644 --- a/tests/unit/test_packaging.py +++ b/tests/unit/test_packaging.py @@ -1,12 +1,11 @@ from typing import Optional, Tuple import pytest +from pip._internal.utils.packaging import check_requires_python, get_requirement from pip._vendor.packaging import specifiers from pip._vendor.packaging.requirements import Requirement -from pip._internal.utils.packaging import check_requires_python, get_requirement - @pytest.mark.parametrize( "version_info, requires_python, expected", diff --git a/tests/unit/test_pep517.py b/tests/unit/test_pep517.py index 4264bbdcac8..4233b073fcd 100644 --- a/tests/unit/test_pep517.py +++ b/tests/unit/test_pep517.py @@ -4,7 +4,6 @@ from typing import Tuple import pytest - from pip._internal.exceptions import InstallationError, InvalidPyProjectBuildRequires from pip._internal.req import InstallRequirement diff --git a/tests/unit/test_pyproject_config.py b/tests/unit/test_pyproject_config.py index d385cfb515d..471ad8ba049 100644 --- a/tests/unit/test_pyproject_config.py +++ b/tests/unit/test_pyproject_config.py @@ -1,7 +1,6 @@ from typing import Dict, List import pytest - from pip._internal.commands import create_command diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py index e243a718725..9d15201ad51 100644 --- a/tests/unit/test_req.py +++ b/tests/unit/test_req.py @@ -10,10 +10,6 @@ from unittest import mock import pytest - -from pip._vendor.packaging.markers import Marker -from pip._vendor.packaging.requirements import Requirement - from pip._internal.cache import WheelCache from pip._internal.commands import create_command from pip._internal.commands.install import InstallCommand @@ -48,6 +44,9 @@ ) from pip._internal.resolution.legacy.resolver import Resolver +from pip._vendor.packaging.markers import Marker +from pip._vendor.packaging.requirements import Requirement + from tests.lib import TestData, make_test_finder, requirements_file, wheel diff --git a/tests/unit/test_req_dependency_group.py b/tests/unit/test_req_dependency_group.py index b596f6fc5d7..a72316847fd 100644 --- a/tests/unit/test_req_dependency_group.py +++ b/tests/unit/test_req_dependency_group.py @@ -4,7 +4,6 @@ from typing import Any import pytest - from pip._internal.exceptions import InstallationError from pip._internal.req.req_dependency_group import parse_dependency_groups diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py index 593eeba3594..63d4c59784c 100644 --- a/tests/unit/test_req_file.py +++ b/tests/unit/test_req_file.py @@ -9,9 +9,8 @@ from typing import Any, Iterator, List, Optional, Protocol, Tuple, Union from unittest import mock -import pytest - import pip._internal.req.req_file # this will be monkeypatched +import pytest from pip._internal.exceptions import InstallationError, RequirementsFileParseError from pip._internal.index.package_finder import PackageFinder from pip._internal.models.format_control import FormatControl diff --git a/tests/unit/test_req_install.py b/tests/unit/test_req_install.py index 79828525da4..3370780fecc 100644 --- a/tests/unit/test_req_install.py +++ b/tests/unit/test_req_install.py @@ -3,9 +3,6 @@ from pathlib import Path import pytest - -from pip._vendor.packaging.requirements import Requirement - from pip._internal.exceptions import InstallationError from pip._internal.req.constructors import ( install_req_from_line, @@ -13,6 +10,8 @@ ) from pip._internal.req.req_install import InstallRequirement +from pip._vendor.packaging.requirements import Requirement + class TestInstallRequirementBuildDirectory: # no need to test symlinks on Windows diff --git a/tests/unit/test_req_uninstall.py b/tests/unit/test_req_uninstall.py index 0372eac9bd9..2e2be14ab81 100644 --- a/tests/unit/test_req_uninstall.py +++ b/tests/unit/test_req_uninstall.py @@ -4,9 +4,8 @@ from typing import Iterator, List, Optional, Tuple from unittest.mock import Mock -import pytest - import pip._internal.req.req_uninstall +import pytest from pip._internal.req.req_uninstall import ( StashedUninstallPathSet, UninstallPathSet, diff --git a/tests/unit/test_resolution_legacy_resolver.py b/tests/unit/test_resolution_legacy_resolver.py index 489f678c561..671349eff01 100644 --- a/tests/unit/test_resolution_legacy_resolver.py +++ b/tests/unit/test_resolution_legacy_resolver.py @@ -5,10 +5,6 @@ from unittest import mock import pytest - -from pip._vendor.packaging.specifiers import SpecifierSet -from pip._vendor.packaging.utils import NormalizedName - from pip._internal.exceptions import ( InstallationError, NoneMetadataError, @@ -23,6 +19,9 @@ _check_dist_requires_python, ) +from pip._vendor.packaging.specifiers import SpecifierSet +from pip._vendor.packaging.utils import NormalizedName + from tests.lib import TestData, make_test_finder from tests.lib.index import make_mock_candidate diff --git a/tests/unit/test_self_check_outdated.py b/tests/unit/test_self_check_outdated.py index fba794bc810..55834ec1a26 100644 --- a/tests/unit/test_self_check_outdated.py +++ b/tests/unit/test_self_check_outdated.py @@ -10,13 +10,12 @@ import pytest from freezegun import freeze_time - -from pip._vendor.packaging.version import Version - from pip._internal import self_outdated_check from pip._internal.self_outdated_check import UpgradePrompt, pip_self_version_check from pip._internal.utils.misc import ExternallyManagedEnvironment +from pip._vendor.packaging.version import Version + @pytest.mark.parametrize( "key, expected", diff --git a/tests/unit/test_target_python.py b/tests/unit/test_target_python.py index 63e77a3d8a9..0b04d97a4c6 100644 --- a/tests/unit/test_target_python.py +++ b/tests/unit/test_target_python.py @@ -2,11 +2,10 @@ from unittest import mock import pytest +from pip._internal.models.target_python import TargetPython from pip._vendor.packaging.tags import Tag -from pip._internal.models.target_python import TargetPython - from tests.lib import CURRENT_PY_VERSION_INFO, pyversion diff --git a/tests/unit/test_urls.py b/tests/unit/test_urls.py index 0c145255080..7e20dd873d0 100644 --- a/tests/unit/test_urls.py +++ b/tests/unit/test_urls.py @@ -3,7 +3,6 @@ import urllib.request import pytest - from pip._internal.utils.urls import path_to_url, url_to_path diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index e2d1710739a..118bdee0411 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -14,9 +14,6 @@ from unittest.mock import Mock import pytest - -from pip._vendor.packaging.requirements import Requirement - from pip._internal.exceptions import HashMismatch, HashMissing, InstallationError from pip._internal.utils.deprecation import PipDeprecationWarning, deprecated from pip._internal.utils.egg_link import egg_link_path_from_location @@ -50,6 +47,8 @@ ) from pip._internal.utils.setuptools_build import make_setuptools_shim_args +from pip._vendor.packaging.requirements import Requirement + class Tests_EgglinkPath: "util.egg_link_path_from_location() tests" diff --git a/tests/unit/test_utils_compatibility_tags.py b/tests/unit/test_utils_compatibility_tags.py index f09c451b8ee..9d68a7b9898 100644 --- a/tests/unit/test_utils_compatibility_tags.py +++ b/tests/unit/test_utils_compatibility_tags.py @@ -3,7 +3,6 @@ from unittest.mock import patch import pytest - from pip._internal.utils import compatibility_tags diff --git a/tests/unit/test_utils_retry.py b/tests/unit/test_utils_retry.py index bdb2f23b480..6c965e46915 100644 --- a/tests/unit/test_utils_retry.py +++ b/tests/unit/test_utils_retry.py @@ -5,7 +5,6 @@ from unittest.mock import Mock import pytest - from pip._internal.utils.retry import retry diff --git a/tests/unit/test_utils_subprocess.py b/tests/unit/test_utils_subprocess.py index 65e7d6fdca9..17dfd7b5114 100644 --- a/tests/unit/test_utils_subprocess.py +++ b/tests/unit/test_utils_subprocess.py @@ -4,7 +4,6 @@ from typing import List, Optional, Tuple, Type import pytest - from pip._internal.cli.spinners import SpinnerInterface from pip._internal.exceptions import InstallationSubprocessError from pip._internal.utils.logging import VERBOSE diff --git a/tests/unit/test_utils_temp_dir.py b/tests/unit/test_utils_temp_dir.py index a6cd0d0e5af..b9de985393c 100644 --- a/tests/unit/test_utils_temp_dir.py +++ b/tests/unit/test_utils_temp_dir.py @@ -7,7 +7,6 @@ from unittest import mock import pytest - from pip._internal.utils import temp_dir from pip._internal.utils.misc import ensure_dir from pip._internal.utils.temp_dir import ( diff --git a/tests/unit/test_utils_unpacking.py b/tests/unit/test_utils_unpacking.py index 5f89751311a..5003e5b192d 100644 --- a/tests/unit/test_utils_unpacking.py +++ b/tests/unit/test_utils_unpacking.py @@ -11,7 +11,6 @@ from typing import List, Tuple import pytest - from pip._internal.exceptions import InstallationError from pip._internal.utils.unpacking import is_within_directory, untar_file, unzip_file diff --git a/tests/unit/test_utils_virtualenv.py b/tests/unit/test_utils_virtualenv.py index 94461c6d89e..d22ab78b584 100644 --- a/tests/unit/test_utils_virtualenv.py +++ b/tests/unit/test_utils_virtualenv.py @@ -6,7 +6,6 @@ from typing import List, Optional import pytest - from pip._internal.utils import virtualenv diff --git a/tests/unit/test_utils_wheel.py b/tests/unit/test_utils_wheel.py index b31b51ccae0..77aab46f2c7 100644 --- a/tests/unit/test_utils_wheel.py +++ b/tests/unit/test_utils_wheel.py @@ -7,7 +7,6 @@ from zipfile import ZipFile import pytest - from pip._internal.exceptions import UnsupportedWheel from pip._internal.utils import wheel diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py index c9a026968f4..b096fc06542 100644 --- a/tests/unit/test_vcs.py +++ b/tests/unit/test_vcs.py @@ -4,7 +4,6 @@ from unittest import TestCase, mock import pytest - from pip._internal.exceptions import BadCommand, InstallationError from pip._internal.utils.misc import HiddenText, hide_url, hide_value from pip._internal.utils.subprocess import CommandArgs diff --git a/tests/unit/test_wheel.py b/tests/unit/test_wheel.py index 7b44a59e4a4..051879c975c 100644 --- a/tests/unit/test_wheel.py +++ b/tests/unit/test_wheel.py @@ -12,9 +12,6 @@ from unittest.mock import patch import pytest - -from pip._vendor.packaging.requirements import Requirement - from pip._internal.exceptions import InstallationError from pip._internal.locations import get_scheme from pip._internal.models.direct_url import ( @@ -34,6 +31,8 @@ from pip._internal.utils.misc import hash_file from pip._internal.utils.unpacking import unpack_file +from pip._vendor.packaging.requirements import Requirement + from tests.lib import DATA_DIR, TestData, assert_paths_equal from tests.lib.wheel import make_wheel diff --git a/tests/unit/test_wheel_builder.py b/tests/unit/test_wheel_builder.py index d3d6801ede6..7bd11dfe962 100644 --- a/tests/unit/test_wheel_builder.py +++ b/tests/unit/test_wheel_builder.py @@ -5,7 +5,6 @@ from typing import Optional, cast import pytest - from pip._internal import wheel_builder from pip._internal.models.link import Link from pip._internal.operations.build.wheel_legacy import format_command_result