treewide: replace flake8 with ruff

Makefile

@@ -52,14 +52,15 @@ lint: $(VENV_EXISTS)
  . $(VENV_BIN)/activate && \
  black --check $(ALL_PY_SRCS) && \
  isort --check $(ALL_PY_SRCS) && \
- flake8 $(ALL_PY_SRCS) && \
+ ruff $(ALL_PY_SRCS) && \
  mypy $(PY_MODULE)
  # TODO: Enable.
  # interrogate -c pyproject.toml .
 
 .PHONY: format
-format:
+format: $(VENV_EXISTS)
  . $(VENV_BIN)/activate && \
+ ruff --fix $(ALL_PY_SRCS) && \
  black $(ALL_PY_SRCS) && \
  isort $(ALL_PY_SRCS)
 

abi3audit/_extract.py

@@ -6,9 +6,10 @@
 
 import logging
 import re
+from collections.abc import Iterator
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from typing import Iterator, Optional, Union
+from typing import Union
 from zipfile import ZipFile
 
 from packaging import utils
@@ -122,7 +123,7 @@ class WheelExtractor:
  This extractor collects and yields each shared object in the specified wheel.
  """
 
- def __init__(self, spec: WheelSpec, parent: Optional[PyPIExtractor] = None) -> None:
+ def __init__(self, spec: WheelSpec, parent: PyPIExtractor | None = None) -> None:
  self.spec = spec
  self.path = Path(self.spec)
  self.parent = parent
@@ -158,7 +159,7 @@ class SharedObjectExtractor:
  the spec it created with.
  """
 
- def __init__(self, spec: SharedObjectSpec, parent: Optional[WheelExtractor] = None) -> None:
+ def __init__(self, spec: SharedObjectSpec, parent: WheelExtractor | None = None) -> None:
  self.spec = spec
  self.path = Path(self.spec)
  self.parent = parent

abi3audit/_object.py

@@ -6,7 +6,8 @@
 
 import logging
 import struct
-from typing import Iterator, Optional, Union
+from collections.abc import Iterator
+from typing import Union
 
 import pefile
 from abi3info.models import PyVersion, Symbol
@@ -31,7 +32,7 @@ def __init__(self, extractor: extract.SharedObjectExtractor):
  self._extractor = extractor
  self.path = self._extractor.path
 
- def abi3_version(self, assume_lowest: PyVersion = PyVersion(3, 2)) -> Optional[PyVersion]:
+ def abi3_version(self, assume_lowest: PyVersion = PyVersion(3, 2)) -> PyVersion | None:
  # If we're dealing with a shared object that was extracted from a wheel,
  # we try and suss out the abi3 version from the wheel's own tags.
  if self._extractor.parent is not None:

abi3audit/_state.py

@@ -2,15 +2,17 @@
 `abi3audit` CLI state, broken out to avoid circular imports.
 """
 
+from __future__ import annotations
+
 import os
 import sys
-from typing import Literal, Optional
+from typing import Literal
 
 from rich.console import Console
 
 # TODO: Remove this once rich's NO_COLOR handling is fixed.
 # See: https://github.com/Textualize/rich/issues/2549
-_color_system: Optional[Literal["auto"]]
+_color_system: Literal["auto"] | None
 if os.getenv("NO_COLOR", None) is not None:
  _color_system = None
 else:

pyproject.toml

@@ -47,11 +47,11 @@ test = [
 ]
 lint = [
  "bandit",
- "flake8",
  "black",
  "isort",
  "interrogate",
  "mypy",
+ "ruff",
  "types-requests",
 ]
 dev = [
@@ -98,3 +98,8 @@ line-length = 100
 
 [tool.coverage.run]
 omit = ["abi3audit/_vendor/*"]
+
+[tool.ruff]
+line-length = 100
+select = ["E", "F", "W", "UP"]
+target-version = "py38"