Bump Ruff's target-version to Python 3.9

Author: pradyunsg

docs/html/conf.py

@@ -5,7 +5,6 @@
 import pathlib
 import re
 import sys
-from typing import List, Tuple
 
 # Add the docs/ directory to sys.path, because pip_sphinxext.py is there.
 docs_dir = os.path.dirname(os.path.dirname(__file__))
@@ -101,7 +100,7 @@
 
 
 # List of manual pages generated
-def determine_man_pages() -> List[Tuple[str, str, str, str, int]]:
+def determine_man_pages() -> list[tuple[str, str, str, str, int]]:
     """Determine which man pages need to be generated."""
 
     def to_document_name(path: str, base_dir: str) -> str:

docs/pip_sphinxext.py

@@ -4,8 +4,9 @@
 import pathlib
 import re
 import sys
+from collections.abc import Iterable, Iterator
 from textwrap import dedent
-from typing import Dict, Iterable, Iterator, List, Optional, Union
+from typing import Optional, Union
 
 from docutils import nodes, statemachine
 from docutils.parsers import rst
@@ -24,7 +25,7 @@ def convert_cli_option_to_envvar(opt_name: str) -> str:
     return f"PIP_{normalized_opt_name}"
 
 
-def convert_cli_opt_names_to_envvars(original_cli_opt_names: List[str]) -> List[str]:
+def convert_cli_opt_names_to_envvars(original_cli_opt_names: list[str]) -> list[str]:
     return [
         convert_cli_option_to_envvar(opt_name) for opt_name in original_cli_opt_names
     ]
@@ -69,7 +70,7 @@ def _iter_lines_with_refs(self, lines: Iterable[str]) -> Iterator[str]:
         if prev is not None:
             yield prev
 
-    def run(self) -> List[nodes.Node]:
+    def run(self) -> list[nodes.Node]:
         source = self.state_machine.input_lines.source(
             self.lineno - self.state_machine.input_offset - 1,
         )
@@ -90,7 +91,7 @@ class PipCommandUsage(rst.Directive):
     required_arguments = 1
     optional_arguments = 3
 
-    def run(self) -> List[nodes.Node]:
+    def run(self) -> list[nodes.Node]:
         cmd = create_command(self.arguments[0])
         cmd_prefix = "python -m pip"
         if len(self.arguments) > 1:
@@ -105,7 +106,7 @@ def run(self) -> List[nodes.Node]:
 class PipCommandDescription(rst.Directive):
     required_arguments = 1
 
-    def run(self) -> List[nodes.Node]:
+    def run(self) -> list[nodes.Node]:
         node = nodes.paragraph()
         node.document = self.state.document
         desc = ViewList()
@@ -121,7 +122,7 @@ def run(self) -> List[nodes.Node]:
 class PipOptions(rst.Directive):
     def _format_option(
         self, option: optparse.Option, cmd_name: Optional[str] = None
-    ) -> List[str]:
+    ) -> list[str]:
         bookmark_line = (
             f".. _`{cmd_name}_{option._long_opts[0]}`:"
             if cmd_name
@@ -165,7 +166,7 @@ def _format_options(
             for line in self._format_option(option, cmd_name):
                 self.view_list.append(line, "")
 
-    def run(self) -> List[nodes.Node]:
+    def run(self) -> list[nodes.Node]:
         node = nodes.paragraph()
         node.document = self.state.document
         self.view_list = ViewList()
@@ -242,7 +243,7 @@ class PipCLIDirective(rst.Directive):
     has_content = True
     optional_arguments = 1
 
-    def run(self) -> List[nodes.Node]:
+    def run(self) -> list[nodes.Node]:
         node = nodes.paragraph()
         node.document = self.state.document
 
@@ -310,7 +311,7 @@ def run(self) -> List[nodes.Node]:
         return [node]
 
 
-def setup(app: Sphinx) -> Dict[str, Union[bool, str]]:
+def setup(app: Sphinx) -> dict[str, Union[bool, str]]:
     app.add_directive("pip-command-usage", PipCommandUsage)
     app.add_directive("pip-command-description", PipCommandDescription)
     app.add_directive("pip-command-options", PipCommandOptions)

noxfile.py

@@ -5,8 +5,8 @@
 import os
 import shutil
 import sys
+from collections.abc import Iterator
 from pathlib import Path
-from typing import Iterator, List, Tuple
 
 import nox
 
@@ -136,7 +136,7 @@ def test(session: nox.Session) -> None:
 def docs(session: nox.Session) -> None:
     session.install("-r", REQUIREMENTS["docs"])
 
-    def get_sphinx_build_command(kind: str) -> List[str]:
+    def get_sphinx_build_command(kind: str) -> list[str]:
         # Having the conf.py in the docs/html is weird but needed because we
         # can not use a different configuration directory vs source directory
         # on RTD currently. So, we'll pass "-c docs/html" here.
@@ -214,7 +214,7 @@ def vendoring(session: nox.Session) -> None:
         session.run("vendoring", "sync", "-v")
         return
 
-    def pinned_requirements(path: Path) -> Iterator[Tuple[str, str]]:
+    def pinned_requirements(path: Path) -> Iterator[tuple[str, str]]:
         for line in path.read_text().splitlines(keepends=False):
             one, sep, two = line.partition("==")
             if not sep:
@@ -357,7 +357,7 @@ def build_release(session: nox.Session) -> None:
             shutil.copy(dist, final)
 
 
-def build_dists(session: nox.Session) -> List[str]:
+def build_dists(session: nox.Session) -> list[str]:
     """Return dists with valid metadata."""
     session.log(
         "# Check if there's any Git-untracked files before building the wheel",

pyproject.toml

@@ -154,7 +154,7 @@ 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
+target-version = "py39"  # Pin Ruff to Python 3.9
 src = ["src"]
 line-length = 88
 extend-exclude = [

src/pip/__init__.py

@@ -3,7 +3,7 @@
 __version__ = "25.2.dev0"
 
 
-def main(args: Optional[List[str]] = None) -> int:
+def main(args: Optional[list[str]] = None) -> int:
     """This is an internal API only meant for use by pip's own console scripts.
 
     For additional details, see https://github.com/pypa/pip/issues/7498.

src/pip/_internal/__init__.py

@@ -7,7 +7,7 @@
 _log.init_logging()
 
 
-def main(args: Optional[List[str]] = None) -> int:
+def main(args: Optional[list[str]] = None) -> int:
     """This is preserved for old console scripts that may still be referencing
     it.
 

src/pip/_internal/build_env.py

@@ -7,8 +7,9 @@
 import sys
 import textwrap
 from collections import OrderedDict
+from collections.abc import Iterable
 from types import TracebackType
-from typing import TYPE_CHECKING, Iterable, List, Optional, Set, Tuple, Type, Union
+from typing import TYPE_CHECKING, Optional, Union
 
 from pip._vendor.packaging.version import Version
 
@@ -27,7 +28,7 @@
 logger = logging.getLogger(__name__)
 
 
-def _dedup(a: str, b: str) -> Union[Tuple[str], Tuple[str, str]]:
+def _dedup(a: str, b: str) -> Union[tuple[str], tuple[str, str]]:
     return (a, b) if a != b else (a,)
 
 
@@ -56,7 +57,7 @@ def get_runnable_pip() -> str:
     return os.fsdecode(source / "__pip-runner__.py")
 
 
-def _get_system_sitepackages() -> Set[str]:
+def _get_system_sitepackages() -> set[str]:
     """Get system site packages
 
     Usually from site.getsitepackages,
@@ -87,8 +88,8 @@ def __init__(self) -> None:
             for name in ("normal", "overlay")
         )
 
-        self._bin_dirs: List[str] = []
-        self._lib_dirs: List[str] = []
+        self._bin_dirs: list[str] = []
+        self._lib_dirs: list[str] = []
         for prefix in reversed(list(self._prefixes.values())):
             self._bin_dirs.append(prefix.bin_dir)
             self._lib_dirs.extend(prefix.lib_dirs)
@@ -156,7 +157,7 @@ def __enter__(self) -> None:
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
+        exc_type: Optional[type[BaseException]],
         exc_val: Optional[BaseException],
         exc_tb: Optional[TracebackType],
     ) -> None:
@@ -168,7 +169,7 @@ def __exit__(
 
     def check_requirements(
         self, reqs: Iterable[str]
-    ) -> Tuple[Set[Tuple[str, str]], Set[str]]:
+    ) -> tuple[set[tuple[str, str]], set[str]]:
         """Return 2 sets:
         - conflicting requirements: set of (installed, wanted) reqs tuples
         - missing requirements: set of reqs
@@ -230,7 +231,7 @@ def _install_requirements(
         *,
         kind: str,
     ) -> None:
-        args: List[str] = [
+        args: list[str] = [
             sys.executable,
             pip_runnable,
             "install",
@@ -305,7 +306,7 @@ def __enter__(self) -> None:
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
+        exc_type: Optional[type[BaseException]],
         exc_val: Optional[BaseException],
         exc_tb: Optional[TracebackType],
     ) -> None:

src/pip/_internal/cache.py

@@ -5,7 +5,7 @@
 import logging
 import os
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any, Optional
 
 from pip._vendor.packaging.tags import Tag, interpreter_name, interpreter_version
 from pip._vendor.packaging.utils import canonicalize_name
@@ -22,7 +22,7 @@
 ORIGIN_JSON_NAME = "origin.json"
 
 
-def _hash_dict(d: Dict[str, str]) -> str:
+def _hash_dict(d: dict[str, str]) -> str:
     """Return a stable sha224 of a dictionary."""
     s = json.dumps(d, sort_keys=True, separators=(",", ":"), ensure_ascii=True)
     return hashlib.sha224(s.encode("ascii")).hexdigest()
@@ -39,7 +39,7 @@ def __init__(self, cache_dir: str) -> None:
         assert not cache_dir or os.path.isabs(cache_dir)
         self.cache_dir = cache_dir or None
 
-    def _get_cache_path_parts(self, link: Link) -> List[str]:
+    def _get_cache_path_parts(self, link: Link) -> list[str]:
         """Get parts of part that must be os.path.joined with cache_dir"""
 
         # We want to generate an url to use as our cache key, we don't want to
@@ -72,7 +72,7 @@ def _get_cache_path_parts(self, link: Link) -> List[str]:
 
         return parts
 
-    def _get_candidates(self, link: Link, canonical_package_name: str) -> List[Any]:
+    def _get_candidates(self, link: Link, canonical_package_name: str) -> list[Any]:
         can_not_cache = not self.cache_dir or not canonical_package_name or not link
         if can_not_cache:
             return []
@@ -90,7 +90,7 @@ def get(
         self,
         link: Link,
         package_name: Optional[str],
-        supported_tags: List[Tag],
+        supported_tags: list[Tag],
     ) -> Link:
         """Returns a link to a cached item if it exists, otherwise returns the
         passed link.
@@ -128,7 +128,7 @@ def get(
         self,
         link: Link,
         package_name: Optional[str],
-        supported_tags: List[Tag],
+        supported_tags: list[Tag],
     ) -> Link:
         candidates = []
 
@@ -226,7 +226,7 @@ def get(
         self,
         link: Link,
         package_name: Optional[str],
-        supported_tags: List[Tag],
+        supported_tags: list[Tag],
     ) -> Link:
         cache_entry = self.get_cache_entry(link, package_name, supported_tags)
         if cache_entry is None:
@@ -237,7 +237,7 @@ def get_cache_entry(
         self,
         link: Link,
         package_name: Optional[str],
-        supported_tags: List[Tag],
+        supported_tags: list[Tag],
     ) -> Optional[CacheEntry]:
         """Returns a CacheEntry with a link to a cached item if it exists or
         None. The cache entry indicates if the item was found in the persistent

src/pip/_internal/cli/autocompletion.py

@@ -3,8 +3,9 @@
 import optparse
 import os
 import sys
+from collections.abc import Iterable
 from itertools import chain
-from typing import Any, Iterable, List, Optional
+from typing import Any, Optional
 
 from pip._internal.cli.main_parser import create_main_parser
 from pip._internal.commands import commands_dict, create_command
@@ -121,7 +122,7 @@ def autocomplete() -> None:
 
 
 def get_path_completion_type(
-    cwords: List[str], cword: int, opts: Iterable[Any]
+    cwords: list[str], cword: int, opts: Iterable[Any]
 ) -> Optional[str]:
     """Get the type of path completion (``file``, ``dir``, ``path`` or None)
 

src/pip/_internal/cli/base_command.py

@@ -7,7 +7,7 @@
 import sys
 import traceback
 from optparse import Values
-from typing import List, Optional, Tuple
+from typing import Optional
 
 from pip._vendor.rich import reconfigure
 from pip._vendor.rich import traceback as rich_traceback
@@ -87,10 +87,10 @@ def handle_pip_version_check(self, options: Values) -> None:
         # are present.
         assert not hasattr(options, "no_index")
 
-    def run(self, options: Values, args: List[str]) -> int:
+    def run(self, options: Values, args: list[str]) -> int:
         raise NotImplementedError
 
-    def _run_wrapper(self, level_number: int, options: Values, args: List[str]) -> int:
+    def _run_wrapper(self, level_number: int, options: Values, args: list[str]) -> int:
         def _inner_run() -> int:
             try:
                 return self.run(options, args)
@@ -147,18 +147,18 @@ def _inner_run() -> int:
 
             return UNKNOWN_ERROR
 
-    def parse_args(self, args: List[str]) -> Tuple[Values, List[str]]:
+    def parse_args(self, args: list[str]) -> tuple[Values, list[str]]:
         # factored out for testability
         return self.parser.parse_args(args)
 
-    def main(self, args: List[str]) -> int:
+    def main(self, args: list[str]) -> int:
         try:
             with self.main_context():
                 return self._main(args)
         finally:
             logging.shutdown()
 
-    def _main(self, args: List[str]) -> int:
+    def _main(self, args: list[str]) -> int:
         # We must initialize this before the tempdir manager, otherwise the
         # configuration would not be accessible by the time we clean up the
         # tempdir manager.