Skip to content

Commit 8bf09c1

Browse files
Reapply ruff/isort rules (I)
1 parent dbb38af commit 8bf09c1

File tree

85 files changed

+97
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+97
-121
lines changed

Diff for: tests/conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
from installer import install
4444
from installer.destinations import SchemeDictionaryDestination
4545
from installer.sources import WheelFile
46-
4746
from pip import __file__ as pip_location
4847
from pip._internal.locations import _USE_SYSCONFIG
4948
from pip._internal.utils.temp_dir import global_tempdir_manager
49+
5050
from tests.lib import (
5151
DATA_DIR,
5252
SRC_DIR,

Diff for: tests/functional/test_build_env.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from typing import Optional
55

66
import pytest
7-
87
from pip._internal.build_env import BuildEnvironment, _get_system_sitepackages
8+
99
from tests.lib import (
1010
PipTestEnvironment,
1111
TestPipResult,

Diff for: tests/functional/test_cli.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
from textwrap import dedent
88

99
import pytest
10-
1110
from pip._internal.commands import commands_dict
11+
1212
from tests.lib import PipTestEnvironment
1313

1414

Diff for: tests/functional/test_config_settings.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from zipfile import ZipFile
66

77
from pip._internal.utils.urls import path_to_url
8+
89
from tests.lib import PipTestEnvironment, create_basic_sdist_for_package
910

1011
PYPROJECT_TOML = """\

Diff for: tests/functional/test_configuration.py

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from pip._internal.cli.status_codes import ERROR
88
from pip._internal.configuration import CONFIG_BASENAME, get_configuration_files
9+
910
from tests.lib import PipTestEnvironment
1011
from tests.lib.configuration_helpers import ConfigurationMixin, kinds
1112
from tests.lib.venv import VirtualEnvironment

Diff for: tests/functional/test_debug.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
from typing import List
33

44
import pytest
5-
from pip._vendor.packaging.version import Version
6-
75
from pip._internal.commands.debug import create_vendor_txt_map
86
from pip._internal.utils import compatibility_tags
7+
from pip._vendor.packaging.version import Version
8+
99
from tests.lib import PipTestEnvironment
1010

1111

Diff for: tests/functional/test_download.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
from typing import Callable, List, Tuple
99

1010
import pytest
11-
1211
from pip._internal.cli.status_codes import ERROR
1312
from pip._internal.utils.urls import path_to_url
13+
1414
from tests.lib import (
1515
PipTestEnvironment,
1616
ScriptFactory,

Diff for: tests/functional/test_fast_deps.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
from typing import Iterable
88

99
import pytest
10+
from pip._internal.utils.misc import hash_file
1011
from pip._vendor.packaging.utils import canonicalize_name
1112

12-
from pip._internal.utils.misc import hash_file
1313
from tests.lib import PipTestEnvironment, TestData, TestPipResult
1414

1515

Diff for: tests/functional/test_freeze.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from pathlib import Path
77

88
import pytest
9+
from pip._internal.models.direct_url import DirectUrl, DirInfo
910
from pip._vendor.packaging.utils import canonicalize_name
1011

11-
from pip._internal.models.direct_url import DirectUrl, DirInfo
1212
from tests.lib import (
1313
PipTestEnvironment,
1414
TestData,

Diff for: tests/functional/test_help.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from unittest.mock import Mock
22

33
import pytest
4-
54
from pip._internal.cli.status_codes import ERROR, SUCCESS
65
from pip._internal.commands import commands_dict, create_command
76
from pip._internal.exceptions import CommandError
7+
88
from tests.lib import InMemoryPip, PipTestEnvironment
99

1010

Diff for: tests/functional/test_index.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
2-
32
from pip._internal.cli.status_codes import ERROR, SUCCESS
43
from pip._internal.commands import create_command
4+
55
from tests.lib import PipTestEnvironment
66

77

Diff for: tests/functional/test_install.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
from typing import Dict, Iterable, List, Optional, Tuple
1313

1414
import pytest
15-
1615
from pip._internal.cli.status_codes import ERROR, SUCCESS
1716
from pip._internal.models.index import PyPI, TestPyPI
1817
from pip._internal.utils.misc import rmtree
1918
from pip._internal.utils.urls import path_to_url
19+
2020
from tests.lib import (
2121
CertFactory,
2222
PipTestEnvironment,

Diff for: tests/functional/test_install_direct_url.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest
2-
32
from pip._internal.models.direct_url import VcsInfo
3+
44
from tests.lib import PipTestEnvironment, TestData, _create_test_package
55
from tests.lib.direct_url import get_created_direct_url
66

Diff for: tests/functional/test_invalid_versions_and_specifiers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import zipfile
22

33
import pytest
4-
54
from pip._internal.metadata import select_backend
5+
66
from tests.lib import PipTestEnvironment, TestData
77

88

Diff for: tests/functional/test_list.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from pathlib import Path
44

55
import pytest
6-
76
from pip._internal.models.direct_url import DirectUrl, DirInfo
7+
88
from tests.lib import (
99
PipTestEnvironment,
1010
ScriptFactory,

Diff for: tests/functional/test_new_resolver_target.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
from typing import Callable, Optional
33

44
import pytest
5-
65
from pip._internal.cli.status_codes import ERROR, SUCCESS
6+
77
from tests.lib import PipTestEnvironment
88
from tests.lib.wheel import make_wheel
99

Diff for: tests/functional/test_pep517.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
import pytest
66
import tomli_w
7-
87
from pip._internal.build_env import BuildEnvironment
98
from pip._internal.req import InstallRequirement
9+
1010
from tests.lib import (
1111
PipTestEnvironment,
1212
TestData,

Diff for: tests/functional/test_pip_runner_script.py

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from pathlib import Path
33

44
from pip import __version__
5+
56
from tests.lib import PipTestEnvironment
67

78

Diff for: tests/functional/test_search.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
from unittest import mock
44

55
import pytest
6-
76
from pip._internal.cli.status_codes import NO_MATCHES_FOUND, SUCCESS
87
from pip._internal.commands import create_command
98
from pip._internal.commands.search import highest_version, print_results, transform_hits
9+
1010
from tests.lib import PipTestEnvironment
1111

1212
if TYPE_CHECKING:

Diff for: tests/functional/test_show.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import textwrap
55

66
import pytest
7-
87
from pip import __version__
98
from pip._internal.commands.show import search_packages_info
109
from pip._internal.utils.unpacking import untar_file
10+
1111
from tests.lib import (
1212
PipTestEnvironment,
1313
TestData,

Diff for: tests/functional/test_uninstall.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from unittest.mock import Mock
1010

1111
import pytest
12-
1312
from pip._internal.req.constructors import install_req_from_line
1413
from pip._internal.utils.misc import rmtree
14+
1515
from tests.lib import (
1616
PipTestEnvironment,
1717
TestData,

Diff for: tests/functional/test_vcs_bazaar.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
from pathlib import Path
88

99
import pytest
10-
1110
from pip._internal.vcs.bazaar import Bazaar
1211
from pip._internal.vcs.versioncontrol import RemoteNotFoundError
12+
1313
from tests.lib import PipTestEnvironment, is_bzr_installed, need_bzr
1414

1515

Diff for: tests/functional/test_vcs_git.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
from unittest.mock import Mock, patch
1010

1111
import pytest
12-
1312
from pip._internal.utils.misc import HiddenText
1413
from pip._internal.vcs import vcs
1514
from pip._internal.vcs.git import Git, RemoteNotFoundError
15+
1616
from tests.lib import PipTestEnvironment, _create_test_package, _git_commit
1717

1818

Diff for: tests/functional/test_vcs_mercurial.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import os
22

33
from pip._internal.vcs.mercurial import Mercurial
4+
45
from tests.lib import PipTestEnvironment, _create_test_package, need_mercurial
56

67

Diff for: tests/functional/test_vcs_subversion.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from pathlib import Path
22

33
import pytest
4-
54
from pip._internal.vcs.subversion import Subversion
65
from pip._internal.vcs.versioncontrol import RemoteNotFoundError
6+
77
from tests.lib import PipTestEnvironment, _create_svn_repo, need_svn
88

99

Diff for: tests/functional/test_wheel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from pathlib import Path
77

88
import pytest
9-
109
from pip._internal.cli.status_codes import ERROR
10+
1111
from tests.lib import (
1212
PipTestEnvironment,
1313
TestData,

Diff for: tests/lib/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
from zipfile import ZipFile
3333

3434
import pytest
35-
from pip._vendor.packaging.utils import canonicalize_name
36-
from scripttest import FoundDir, FoundFile, ProcResult, TestFileEnvironment
37-
3835
from pip._internal.cli.main import main as pip_entry_point
3936
from pip._internal.index.collector import LinkCollector
4037
from pip._internal.index.package_finder import PackageFinder
@@ -44,6 +41,9 @@
4441
from pip._internal.models.target_python import TargetPython
4542
from pip._internal.network.session import PipSession
4643
from pip._internal.utils.egg_link import _egg_link_names
44+
from pip._vendor.packaging.utils import canonicalize_name
45+
from scripttest import FoundDir, FoundFile, ProcResult, TestFileEnvironment
46+
4747
from tests.lib.venv import VirtualEnvironment
4848
from tests.lib.wheel import make_wheel
4949

Diff for: tests/lib/direct_url.py

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from typing import Optional
55

66
from pip._internal.models.direct_url import DIRECT_URL_METADATA_NAME, DirectUrl
7+
78
from tests.lib import TestPipResult
89

910

Diff for: tests/lib/wheel.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
)
2626
from zipfile import ZipFile
2727

28-
from pip._vendor.requests.structures import CaseInsensitiveDict
29-
3028
from pip._internal.metadata import BaseDistribution, MemoryWheel, get_wheel_distribution
29+
from pip._vendor.requests.structures import CaseInsensitiveDict
3130

3231
# As would be used in metadata
3332
HeaderValue = Union[str, List[str]]

Diff for: tests/unit/metadata/test_metadata.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
from unittest import mock
66

77
import pytest
8-
from pip._vendor.packaging.utils import NormalizedName
9-
108
from pip._internal.metadata import (
119
BaseDistribution,
1210
get_directory_distribution,
@@ -15,6 +13,8 @@
1513
)
1614
from pip._internal.metadata.base import FilesystemWheel
1715
from pip._internal.models.direct_url import DIRECT_URL_METADATA_NAME, ArchiveInfo
16+
from pip._vendor.packaging.utils import NormalizedName
17+
1818
from tests.lib.wheel import make_wheel
1919

2020

Diff for: tests/unit/metadata/test_metadata_pkg_resources.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
from unittest import mock
55

66
import pytest
7-
from pip._vendor.packaging.requirements import Requirement
8-
from pip._vendor.packaging.specifiers import SpecifierSet
9-
from pip._vendor.packaging.utils import canonicalize_name
10-
from pip._vendor.packaging.version import parse as parse_version
11-
127
from pip._internal.exceptions import UnsupportedWheel
138
from pip._internal.metadata.pkg_resources import (
149
Distribution,
1510
Environment,
1611
InMemoryMetadata,
1712
)
13+
from pip._vendor.packaging.requirements import Requirement
14+
from pip._vendor.packaging.specifiers import SpecifierSet
15+
from pip._vendor.packaging.utils import canonicalize_name
16+
from pip._vendor.packaging.version import parse as parse_version
1817

1918
pkg_resources = pytest.importorskip("pip._vendor.pkg_resources")
2019

Diff for: tests/unit/resolution_resolvelib/conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from typing import Iterator
22

33
import pytest
4-
54
from pip._internal.cli.req_command import RequirementCommand
65
from pip._internal.commands.install import InstallCommand
76
from pip._internal.index.collector import LinkCollector
@@ -17,6 +16,7 @@
1716
from pip._internal.resolution.resolvelib.factory import Factory
1817
from pip._internal.resolution.resolvelib.provider import PipProvider
1918
from pip._internal.utils.temp_dir import TempDirectory, global_tempdir_manager
19+
2020
from tests.lib import TestData
2121

2222

Diff for: tests/unit/resolution_resolvelib/test_provider.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
from typing import TYPE_CHECKING, List, Optional
22

3-
from pip._vendor.resolvelib.resolvers import RequirementInformation
4-
53
from pip._internal.models.candidate import InstallationCandidate
64
from pip._internal.models.link import Link
75
from pip._internal.req.constructors import install_req_from_req_string
86
from pip._internal.resolution.resolvelib.factory import Factory
97
from pip._internal.resolution.resolvelib.provider import PipProvider
108
from pip._internal.resolution.resolvelib.requirements import SpecifierRequirement
9+
from pip._vendor.resolvelib.resolvers import RequirementInformation
1110

1211
if TYPE_CHECKING:
1312
from pip._internal.resolution.resolvelib.provider import PreferenceInformation

Diff for: tests/unit/resolution_resolvelib/test_requirement.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
from typing import List, Tuple
44

55
import pytest
6-
from pip._vendor.resolvelib import BaseReporter, Resolver
7-
86
from pip._internal.resolution.resolvelib.base import Candidate, Constraint, Requirement
97
from pip._internal.resolution.resolvelib.factory import Factory
108
from pip._internal.resolution.resolvelib.provider import PipProvider
9+
from pip._vendor.resolvelib import BaseReporter, Resolver
10+
1111
from tests.lib import TestData
1212

1313
# NOTE: All tests are prefixed `test_rlr` (for "test resolvelib resolver").

0 commit comments

Comments
 (0)