Enable all FA rules for ruff

This enables use of Python 3.10+ type annotation syntax, reducing the
churn that would be caused when moving to Python 3.10.

Author: pradyunsg

docs/pip_sphinxext.py

@@ -1,12 +1,13 @@
 """pip sphinx extensions"""
 
+from __future__ import annotations
+
 import optparse
 import pathlib
 import re
 import sys
 from collections.abc import Iterable, Iterator
 from textwrap import dedent
-from typing import Optional, Union
 
 from docutils import nodes, statemachine
 from docutils.parsers import rst
@@ -34,9 +35,7 @@ def convert_cli_opt_names_to_envvars(original_cli_opt_names: list[str]) -> list[
 class PipNewsInclude(rst.Directive):
     required_arguments = 1
 
-    def _is_version_section_title_underline(
-        self, prev: Optional[str], curr: str
-    ) -> bool:
+    def _is_version_section_title_underline(self, prev: str | None, curr: str) -> bool:
         """Find a ==== line that marks the version section title."""
         if prev is None:
             return False
@@ -121,7 +120,7 @@ def run(self) -> list[nodes.Node]:
 
 class PipOptions(rst.Directive):
     def _format_option(
-        self, option: optparse.Option, cmd_name: Optional[str] = None
+        self, option: optparse.Option, cmd_name: str | None = None
     ) -> list[str]:
         bookmark_line = (
             f".. _`{cmd_name}_{option._long_opts[0]}`:"
@@ -158,7 +157,7 @@ def _format_option(
         ]
 
     def _format_options(
-        self, options: Iterable[optparse.Option], cmd_name: Optional[str] = None
+        self, options: Iterable[optparse.Option], cmd_name: str | None = None
     ) -> None:
         for option in options:
             if option.help == optparse.SUPPRESS_HELP:
@@ -311,7 +310,7 @@ def run(self) -> list[nodes.Node]:
         return [node]
 
 
-def setup(app: Sphinx) -> dict[str, Union[bool, str]]:
+def setup(app: Sphinx) -> dict[str, bool | str]:
     app.add_directive("pip-command-usage", PipCommandUsage)
     app.add_directive("pip-command-description", PipCommandDescription)
     app.add_directive("pip-command-options", PipCommandOptions)

pyproject.toml

@@ -187,7 +187,7 @@ select = [
     "W",
     "RUF100",
     "UP",
-    "FA102",  # future-required-type-annotation
+    "FA",
 ]
 
 [tool.ruff.lint.isort]

src/pip/__init__.py

@@ -1,9 +1,9 @@
-from typing import Optional
+from __future__ import annotations
 
 __version__ = "25.2.dev0"
 
 
-def main(args: Optional[list[str]] = None) -> int:
+def main(args: list[str] | None = 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

@@ -1,4 +1,4 @@
-from typing import Optional
+from __future__ import annotations
 
 from pip._internal.utils import _log
 
@@ -7,7 +7,7 @@
 _log.init_logging()
 
 
-def main(args: Optional[list[str]] = None) -> int:
+def main(args: list[str] | None = None) -> int:
     """This is preserved for old console scripts that may still be referencing
     it.
 

src/pip/_internal/build_env.py

@@ -1,5 +1,7 @@
 """Build Environment used for isolation during sdist building"""
 
+from __future__ import annotations
+
 import logging
 import os
 import pathlib
@@ -9,7 +11,7 @@
 from collections import OrderedDict
 from collections.abc import Iterable
 from types import TracebackType
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 
 from pip._vendor.packaging.version import Version
 
@@ -28,7 +30,7 @@
 logger = logging.getLogger(__name__)
 
 
-def _dedup(a: str, b: str) -> Union[tuple[str], tuple[str, str]]:
+def _dedup(a: str, b: str) -> tuple[str] | tuple[str, str]:
     return (a, b) if a != b else (a,)
 
 
@@ -157,9 +159,9 @@ def __enter__(self) -> None:
 
     def __exit__(
         self,
-        exc_type: Optional[type[BaseException]],
-        exc_val: Optional[BaseException],
-        exc_tb: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
     ) -> None:
         for varname, old_value in self._save_env.items():
             if old_value is None:
@@ -203,7 +205,7 @@ def check_requirements(
 
     def install_requirements(
         self,
-        finder: "PackageFinder",
+        finder: PackageFinder,
         requirements: Iterable[str],
         prefix_as_string: str,
         *,
@@ -225,7 +227,7 @@ def install_requirements(
     @staticmethod
     def _install_requirements(
         pip_runnable: str,
-        finder: "PackageFinder",
+        finder: PackageFinder,
         requirements: Iterable[str],
         prefix: _Prefix,
         *,
@@ -306,9 +308,9 @@ def __enter__(self) -> None:
 
     def __exit__(
         self,
-        exc_type: Optional[type[BaseException]],
-        exc_val: Optional[BaseException],
-        exc_tb: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
     ) -> None:
         pass
 
@@ -317,7 +319,7 @@ def cleanup(self) -> None:
 
     def install_requirements(
         self,
-        finder: "PackageFinder",
+        finder: PackageFinder,
         requirements: Iterable[str],
         prefix_as_string: str,
         *,

src/pip/_internal/cache.py

@@ -1,11 +1,13 @@
 """Cache Management"""
 
+from __future__ import annotations
+
 import hashlib
 import json
 import logging
 import os
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from pip._vendor.packaging.tags import Tag, interpreter_name, interpreter_version
 from pip._vendor.packaging.utils import canonicalize_name
@@ -89,7 +91,7 @@ def get_path_for_link(self, link: Link) -> str:
     def get(
         self,
         link: Link,
-        package_name: Optional[str],
+        package_name: str | None,
         supported_tags: list[Tag],
     ) -> Link:
         """Returns a link to a cached item if it exists, otherwise returns the
@@ -127,7 +129,7 @@ def get_path_for_link(self, link: Link) -> str:
     def get(
         self,
         link: Link,
-        package_name: Optional[str],
+        package_name: str | None,
         supported_tags: list[Tag],
     ) -> Link:
         candidates = []
@@ -188,7 +190,7 @@ def __init__(
     ):
         self.link = link
         self.persistent = persistent
-        self.origin: Optional[DirectUrl] = None
+        self.origin: DirectUrl | None = None
         origin_direct_url_path = Path(self.link.file_path).parent / ORIGIN_JSON_NAME
         if origin_direct_url_path.exists():
             try:
@@ -225,7 +227,7 @@ def get_ephem_path_for_link(self, link: Link) -> str:
     def get(
         self,
         link: Link,
-        package_name: Optional[str],
+        package_name: str | None,
         supported_tags: list[Tag],
     ) -> Link:
         cache_entry = self.get_cache_entry(link, package_name, supported_tags)
@@ -236,9 +238,9 @@ def get(
     def get_cache_entry(
         self,
         link: Link,
-        package_name: Optional[str],
+        package_name: str | None,
         supported_tags: list[Tag],
-    ) -> Optional[CacheEntry]:
+    ) -> CacheEntry | None:
         """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
         or ephemeral cache.

src/pip/_internal/cli/autocompletion.py

@@ -1,11 +1,13 @@
 """Logic that powers autocompletion installed by ``pip completion``."""
 
+from __future__ import annotations
+
 import optparse
 import os
 import sys
 from collections.abc import Iterable
 from itertools import chain
-from typing import Any, Optional
+from typing import Any
 
 from pip._internal.cli.main_parser import create_main_parser
 from pip._internal.commands import commands_dict, create_command
@@ -33,7 +35,7 @@ def autocomplete() -> None:
     options = []
 
     # subcommand
-    subcommand_name: Optional[str] = None
+    subcommand_name: str | None = None
     for word in cwords:
         if word in subcommands:
             subcommand_name = word
@@ -123,7 +125,7 @@ def autocomplete() -> None:
 
 def get_path_completion_type(
     cwords: list[str], cword: int, opts: Iterable[Any]
-) -> Optional[str]:
+) -> str | None:
     """Get the type of path completion (``file``, ``dir``, ``path`` or None)
 
     :param cwords: same as the environmental variable ``COMP_WORDS``

src/pip/_internal/cli/base_command.py

@@ -1,13 +1,14 @@
 """Base Command class, and related routines"""
 
+from __future__ import annotations
+
 import logging
 import logging.config
 import optparse
 import os
 import sys
 import traceback
 from optparse import Values
-from typing import Optional
 
 from pip._vendor.rich import reconfigure
 from pip._vendor.rich import traceback as rich_traceback
@@ -60,7 +61,7 @@ def __init__(self, name: str, summary: str, isolated: bool = False) -> None:
             isolated=isolated,
         )
 
-        self.tempdir_registry: Optional[TempDirRegistry] = None
+        self.tempdir_registry: TempDirRegistry | None = None
 
         # Commands should add options to this option group
         optgroup_name = f"{self.name.capitalize()} Options"

src/pip/_internal/cli/cmdoptions.py

@@ -9,6 +9,7 @@
 
 # The following comment should be removed at some point in the future.
 # mypy: strict-optional=False
+from __future__ import annotations
 
 import importlib.util
 import logging
@@ -18,7 +19,7 @@
 from functools import partial
 from optparse import SUPPRESS_HELP, Option, OptionGroup, OptionParser, Values
 from textwrap import dedent
-from typing import Any, Callable, Optional
+from typing import Any, Callable
 
 from pip._vendor.packaging.utils import canonicalize_name
 
@@ -555,7 +556,7 @@ def only_binary() -> Option:
 
 
 # This was made a separate function for unit-testing purposes.
-def _convert_python_version(value: str) -> tuple[tuple[int, ...], Optional[str]]:
+def _convert_python_version(value: str) -> tuple[tuple[int, ...], str | None]:
     """
     Convert a version string like "3", "37", or "3.7.3" into a tuple of ints.
 

src/pip/_internal/cli/index_command.py

@@ -6,12 +6,14 @@
 --uptodate) don't need waste time importing PipSession and friends.
 """
 
+from __future__ import annotations
+
 import logging
 import os
 import sys
 from functools import lru_cache
 from optparse import Values
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from pip._vendor import certifi
 
@@ -27,7 +29,7 @@
 
 
 @lru_cache
-def _create_truststore_ssl_context() -> Optional["SSLContext"]:
+def _create_truststore_ssl_context() -> SSLContext | None:
     if sys.version_info < (3, 10):
         logger.debug("Disabling truststore because Python version isn't 3.10+")
         return None
@@ -56,10 +58,10 @@ class SessionCommandMixin(CommandContextMixIn):
 
     def __init__(self) -> None:
         super().__init__()
-        self._session: Optional[PipSession] = None
+        self._session: PipSession | None = None
 
     @classmethod
-    def _get_index_urls(cls, options: Values) -> Optional[list[str]]:
+    def _get_index_urls(cls, options: Values) -> list[str] | None:
         """Return a list of index urls from user-provided options."""
         index_urls = []
         if not getattr(options, "no_index", False):
@@ -72,7 +74,7 @@ def _get_index_urls(cls, options: Values) -> Optional[list[str]]:
         # Return None rather than an empty list
         return index_urls or None
 
-    def get_default_session(self, options: Values) -> "PipSession":
+    def get_default_session(self, options: Values) -> PipSession:
         """Get a default-managed session."""
         if self._session is None:
             self._session = self.enter_context(self._build_session(options))
@@ -85,9 +87,9 @@ def get_default_session(self, options: Values) -> "PipSession":
     def _build_session(
         self,
         options: Values,
-        retries: Optional[int] = None,
-        timeout: Optional[int] = None,
-    ) -> "PipSession":
+        retries: int | None = None,
+        timeout: int | None = None,
+    ) -> PipSession:
         from pip._internal.network.session import PipSession
 
         cache_dir = options.cache_dir
@@ -134,7 +136,7 @@ def _build_session(
         return session
 
 
-def _pip_self_version_check(session: "PipSession", options: Values) -> None:
+def _pip_self_version_check(session: PipSession, options: Values) -> None:
     from pip._internal.self_outdated_check import pip_self_version_check as check
 
     check(session, options)