Apply new repo-review suggestion RF003

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",

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

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 (

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

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
 
 

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
 

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
 
 

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,

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

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
 

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

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

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

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 (

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

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
 

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

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

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
 

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
 

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

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
 

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 (

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

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]]
 

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
 
 

tests/unit/metadata/test_metadata_pkg_resources.py

@@ -4,19 +4,18 @@
 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,
     Environment,
     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")
 
 

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

tests/unit/resolution_resolvelib/test_provider.py

@@ -2,21 +2,20 @@
 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
 from pip._internal.resolution.resolvelib.factory import Factory
 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]
 
 

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").

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:

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")

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

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("")

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