Revert selected changes

Author: AA-Turner

Tools/build/.ruff.toml

@@ -12,7 +12,6 @@ select = [
     "LOG",     # flake8-logging
     "PGH",     # pygrep-hooks
     "PT",      # flake8-pytest-style
-    "PYI",     # flake8-pyi
     "RUF100",  # Ban unused `# noqa` comments
     "UP",      # pyupgrade
     "W",       # pycodestyle
@@ -30,10 +29,3 @@ ignore = [
 "{check_extension_modules,freeze_modules,generate_re_casefix,generate_sre_constants}.py" = [
     "UP031",  # Use format specifiers instead of percent format
 ]
-
-"check_extension_modules.py" = [
-    "PYI024",  # Use `typing.NamedTuple` instead of `collections.namedtuple`
-]
-"freeze_modules.py" = [
-    "PYI024",  # Use `typing.NamedTuple` instead of `collections.namedtuple`
-]

Tools/build/compute-changes.py

@@ -16,7 +16,7 @@
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from collections.abc import Set as AbstractSet
+    from collections.abc import Set
 
 GITHUB_DEFAULT_BRANCH = os.environ["GITHUB_DEFAULT_BRANCH"]
 GITHUB_CODEOWNERS_PATH = Path(".github/CODEOWNERS")
@@ -102,7 +102,7 @@ def git_branches() -> tuple[str, str]:
 
 def get_changed_files(
     ref_a: str = GITHUB_DEFAULT_BRANCH, ref_b: str = "HEAD"
-) -> AbstractSet[Path]:
+) -> Set[Path]:
     """List the files changed between two Git refs, filtered by change type."""
     args = ("git", "diff", "--name-only", f"{ref_a}...{ref_b}", "--")
     print(*args)
@@ -113,7 +113,7 @@ def get_changed_files(
     return frozenset(map(Path, filter(None, map(str.strip, changed_files))))
 
 
-def process_changed_files(changed_files: AbstractSet[Path]) -> Outputs:
+def process_changed_files(changed_files: Set[Path]) -> Outputs:
     run_tests = False
     run_ci_fuzz = False
     run_docs = False

Tools/build/generate_global_objects.py

@@ -434,7 +434,7 @@ def get_identifiers_and_strings() -> 'tuple[set[str], dict[str, str]]':
                 # Give a nice message for common mistakes.
                 # To cover tricky cases (like "\n") we also generate C asserts.
                 raise ValueError(
-                    f'do not use &_Py_ID or &_Py_STR for one-character latin-1 '
+                    'do not use &_Py_ID or &_Py_STR for one-character latin-1 '
                     f'strings, use _Py_LATIN1_CHR instead: {string!r}')
             if string not in strings:
                 strings[string] = name

Tools/build/regen-configure.sh

@@ -6,19 +6,18 @@ set -e -x
 # sync with this script. Use the same container image than the job so the job
 # doesn't need to run autoreconf in a container.
 IMAGE="ghcr.io/python/autoconf:2025.01.02.12581854023"
-# shellcheck disable=SC2034
 AUTORECONF="autoreconf -ivf -Werror"
 
 WORK_DIR="/src"
 
-abs_srcdir="$(cd "$(dirname "$0")/../.."; pwd)"
+abs_srcdir=$(cd $(dirname $0)/../..; pwd)
 
 if podman --version &>/dev/null; then
     RUNTIME="podman"
 elif docker --version &>/dev/null; then
     RUNTIME="docker"
 else
-    echo "$* needs either Podman or Docker container runtime." >&2
+    echo "$@ needs either Podman or Docker container runtime." >&2
     exit 1
 fi
 

Tools/build/stable_abi.py

@@ -548,8 +548,7 @@ def gcc_get_limited_api_macros(headers):
         text=True,
     )
 
-    matches = re.findall(r"#define (\w+)", preprocessor_output_with_macros)
-    return set(matches)
+    return set(re.findall(r"#define (\w+)", preprocessor_output_with_macros))
 
 
 def gcc_get_limited_api_definitions(headers):
@@ -607,7 +606,7 @@ def check_private_names(manifest):
         if name.startswith('_') and not item.abi_only:
             raise ValueError(
                 f'`{name}` is private (underscore-prefixed) and should be '
-                f'removed from the stable ABI list or marked `abi_only`')
+                'removed from the stable ABI list or marked `abi_only`')
 
 def check_dump(manifest, filename):
     """Check that manifest.dump() corresponds to the data.
@@ -647,8 +646,8 @@ def main():
     )
     parser.add_argument(
         "--generate-all", action='store_true',
-        help="as --generate, but generate all file(s) using default filenames. "
-             "(unlike --all, does not run any extra checks)",
+        help="as --generate, but generate all file(s) using default filenames."
+        " (unlike --all, does not run any extra checks)",
     )
     parser.add_argument(
         "-a", "--all", action='store_true',