Apply more ruff rules

docs/pip_sphinxext.py

@@ -37,13 +37,11 @@ def _is_version_section_title_underline(
  self, prev: Optional[str], curr: str
  ) -> bool:
  """Find a ==== line that marks the version section title."""
- if prev is None:
- return False
- if re.match(r"^=+$", curr) is None:
- return False
- if len(curr) < len(prev):
- return False
- return True
+ return (
+ prev is not None
+ and re.match(r"^=+$", curr) is not None
+ and len(curr) >= len(prev)
+ )
 
  def _iter_lines_with_refs(self, lines: Iterable[str]) -> Iterator[str]:
  """Transform the input lines to add a ref before each section title.

pyproject.toml

@@ -163,8 +163,15 @@ extend-exclude = [
 ignore = [
  "B019",
  "B020",
- "B904", # Ruff enables opinionated warnings by default
- "B905", # Ruff enables opinionated warnings by default
+ "B904", # Ruff enables opinionated warnings by default
+ "B905", # Ruff enables opinionated warnings by default
+ "PYI019",
+ "PYI024",
+ "RUF001",
+ "RUF005",
+ "RUF015",
+ "UP027", # deprecated
+ "UP038", # https:/astral-sh/ruff/issues/7871
 ]
 select = [
  "ASYNC",
@@ -177,11 +184,15 @@ select = [
  "I",
  "ISC",
  "PERF",
+ "PGH",
+ "PIE",
  "PLE",
  "PLR0",
- "W",
- "RUF100",
+ "PYI",
+ "RUF",
+ "SLOT",
  "UP",
+ "W",
 ]
 
 [tool.ruff.lint.isort]

src/pip/__pip-runner__.py

@@ -12,7 +12,7 @@
 PYTHON_REQUIRES = (3, 8)
 
 
-def version_str(version): # type: ignore
+def version_str(version): # type: ignore[no-untyped-def]
  return ".".join(str(v) for v in version)
 
 
@@ -35,7 +35,7 @@ def version_str(version): # type: ignore
 
 class PipImportRedirectingFinder:
  @classmethod
- def find_spec(self, fullname, path=None, target=None): # type: ignore
+ def find_spec(self, fullname, path=None, target=None): # type: ignore[no-untyped-def]
  if fullname != "pip":
  return None
 

src/pip/_internal/build_env.py

@@ -316,4 +316,4 @@ def install_requirements(
  *,
  kind: str,
  ) -> None:
- raise NotImplementedError()
+ raise NotImplementedError

src/pip/_internal/cache.py

@@ -85,7 +85,7 @@ def _get_candidates(self, link: Link, canonical_package_name: str) -> List[Any]:
 
  def get_path_for_link(self, link: Link) -> str:
  """Return a directory to store cached items in for link."""
- raise NotImplementedError()
+ raise NotImplementedError
 
  def get(
  self,
@@ -96,7 +96,7 @@ def get(
  """Returns a link to a cached item if it exists, otherwise returns the
  passed link.
  """
- raise NotImplementedError()
+ raise NotImplementedError
 
 
 class SimpleWheelCache(Cache):

src/pip/_internal/cli/main_parser.py

@@ -35,7 +35,7 @@ def create_main_parser() -> ConfigOptionParser:
  parser.add_option_group(gen_opts)
 
  # so the help formatter knows
- parser.main = True # type: ignore
+ parser.main = True # type: ignore[attr-defined]
 
  # create command listing for description
  description = [""] + [

src/pip/_internal/cli/progress_bars.py

@@ -63,7 +63,7 @@ def _raw_progress_bar(
  size: Optional[int],
 ) -> Generator[bytes, None, None]:
  def write_progress(current: int, total: int) -> None:
- sys.stdout.write("Progress %d of %d\n" % (current, total))
+ sys.stdout.write(f"Progress {current} of {total}\n")
  sys.stdout.flush()
 
  current = 0

src/pip/_internal/cli/spinners.py

@@ -13,10 +13,10 @@
 
 class SpinnerInterface:
  def spin(self) -> None:
- raise NotImplementedError()
+ raise NotImplementedError
 
  def finish(self, final_status: str) -> None:
- raise NotImplementedError()
+ raise NotImplementedError
 
 
 class InteractiveSpinner(SpinnerInterface):

src/pip/_internal/commands/index.py

@@ -1,8 +1,6 @@
 import logging
 from optparse import Values
-from typing import Any, Iterable, List, Optional
-
-from pip._vendor.packaging.version import Version
+from typing import TYPE_CHECKING, Any, Iterable, List, Optional
 
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.req_command import IndexGroupCommand
@@ -16,6 +14,9 @@
 from pip._internal.network.session import PipSession
 from pip._internal.utils.misc import write_output
 
+if TYPE_CHECKING:
+ from pip._vendor.packaging.version import Version
+
 logger = logging.getLogger(__name__)
 
 

src/pip/_internal/commands/install.py

@@ -434,7 +434,7 @@ def run(self, options: Values, args: List[str]) -> int:
  raise InstallationError(
  "ERROR: Failed to build installable wheels for some "
  "pyproject.toml based projects ({})".format(
- ", ".join(r.name for r in build_failures) # type: ignore
+ ", ".join(r.name for r in build_failures) # type: ignore[misc]
  )
  )
 

src/pip/_internal/commands/list.py

@@ -4,7 +4,6 @@
 from typing import TYPE_CHECKING, Generator, List, Optional, Sequence, Tuple, cast
 
 from pip._vendor.packaging.utils import canonicalize_name
-from pip._vendor.packaging.version import Version
 
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.index_command import IndexGroupCommand
@@ -16,6 +15,8 @@
 from pip._internal.utils.misc import tabulate, write_output
 
 if TYPE_CHECKING:
+ from pip._vendor.packaging.version import Version
+
  from pip._internal.index.package_finder import PackageFinder
  from pip._internal.network.session import PipSession
 

src/pip/_internal/commands/search.py

@@ -95,7 +95,7 @@ def transform_hits(hits: List[Dict[str, str]]) -> List["TransformedHit"]:
  summary = hit["summary"]
  version = hit["version"]
 
- if name not in packages.keys():
+ if name not in packages:
  packages[name] = {
  "name": name,
  "summary": summary,
@@ -140,10 +140,8 @@ def print_results(
  if name_column_width is None:
  name_column_width = (
  max(
- [
- len(hit["name"]) + len(highest_version(hit.get("versions", ["-"])))
- for hit in hits
- ]
+ len(hit["name"]) + len(highest_version(hit.get("versions", ["-"])))
+ for hit in hits
  )
  + 4
  )

src/pip/_internal/distributions/base.py

@@ -37,11 +37,11 @@ def build_tracker_id(self) -> Optional[str]:
 
  If None, then this dist has no work to do in the build tracker, and
  ``.prepare_distribution_metadata()`` will not be called."""
- raise NotImplementedError()
+ raise NotImplementedError
 
  @abc.abstractmethod
  def get_metadata_distribution(self) -> BaseDistribution:
- raise NotImplementedError()
+ raise NotImplementedError
 
  @abc.abstractmethod
  def prepare_distribution_metadata(
@@ -50,4 +50,4 @@ def prepare_distribution_metadata(
  build_isolation: bool,
  check_build_deps: bool,
  ) -> None:
- raise NotImplementedError()
+ raise NotImplementedError

src/pip/_internal/index/collector.py

@@ -102,7 +102,7 @@ def _ensure_api_response(url: str, session: PipSession) -> None:
  """
  scheme, netloc, path, query, fragment = urllib.parse.urlsplit(url)
  if scheme not in {"http", "https"}:
- raise _NotHTTP()
+ raise _NotHTTP
 
  resp = session.head(url, allow_redirects=True)
  raise_for_status(resp)

src/pip/_internal/index/sources.py

@@ -2,7 +2,7 @@
 import mimetypes
 import os
 from collections import defaultdict
-from typing import Callable, Dict, Iterable, List, Optional, Tuple
+from typing import Callable, ClassVar, Dict, Iterable, List, Optional, Tuple
 
 from pip._vendor.packaging.utils import (
  InvalidSdistFilename,
@@ -30,15 +30,15 @@ class LinkSource:
  @property
  def link(self) -> Optional[Link]:
  """Returns the underlying link, if there's one."""
- raise NotImplementedError()
+ raise NotImplementedError
 
  def page_candidates(self) -> FoundCandidates:
  """Candidates found by parsing an archive listing HTML file."""
- raise NotImplementedError()
+ raise NotImplementedError
 
  def file_links(self) -> FoundLinks:
  """Links found by specifying archives directly."""
- raise NotImplementedError()
+ raise NotImplementedError
 
 
 def _is_html_file(file_url: str) -> bool:
@@ -101,7 +101,7 @@ class _FlatDirectorySource(LinkSource):
  * ``file_candidates``: Archives in the directory.
  """
 
- _paths_to_urls: Dict[str, _FlatDirectoryToUrls] = {}
+ _paths_to_urls: ClassVar[Dict[str, _FlatDirectoryToUrls]] = {}
 
  def __init__(
  self,

src/pip/_internal/locations/__init__.py

@@ -421,9 +421,7 @@ def _looks_like_deb_system_dist_packages(value: str) -> bool:
  """
  if not _looks_like_debian_scheme():
  return False
- if value == "/usr/lib/python3/dist-packages":
- return True
- return False
+ return value == "/usr/lib/python3/dist-packages"
 
 
 def get_purelib() -> str:

src/pip/_internal/locations/_distutils.py

@@ -17,18 +17,20 @@
 import logging
 import os
 import sys
-from distutils.cmd import Command as DistutilsCommand
 from distutils.command.install import SCHEME_KEYS
 from distutils.command.install import install as distutils_install_command
 from distutils.sysconfig import get_python_lib
-from typing import Dict, List, Optional, Union, cast
+from typing import TYPE_CHECKING, Dict, List, Optional, Union, cast
 
 from pip._internal.models.scheme import Scheme
 from pip._internal.utils.compat import WINDOWS
 from pip._internal.utils.virtualenv import running_under_virtualenv
 
 from .base import get_major_minor_version
 
+if TYPE_CHECKING:
+ from distutils.cmd import Command as DistutilsCommand
+
 logger = logging.getLogger(__name__)
 
 

src/pip/_internal/locations/_sysconfig.py

@@ -94,7 +94,7 @@ def _infer_user() -> str:
  if suffixed in _AVAILABLE_SCHEMES:
  return suffixed
  if "posix_user" not in _AVAILABLE_SCHEMES: # User scheme unavailable.
- raise UserInstallationInvalid()
+ raise UserInstallationInvalid
  return "posix_user"
 
 

src/pip/_internal/metadata/_json.py

@@ -64,10 +64,10 @@ def sanitise_header(h: Union[Header, str]) -> str:
  key = json_name(field)
  if multi:
  value: Union[str, List[str]] = [
- sanitise_header(v) for v in msg.get_all(field) # type: ignore
+ sanitise_header(v) for v in msg.get_all(field) # type: ignore[union-attr]
  ]
  else:
- value = sanitise_header(msg.get(field)) # type: ignore
+ value = sanitise_header(msg.get(field)) # type: ignore[arg-type]
  if key == "keywords":
  # Accept both comma-separated and space-separated
  # forms, for better compatibility with old data.