Fix CI - MyPy and Ruff updates

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.12.0
+  rev: v0.15.12
   hooks:
   - id: ruff-check
     args: [--fix, --unsafe-fixes]

conftest.py

@@ -48,7 +48,7 @@ def _save_cwd():
 
 @pytest.fixture
 def distutils_managed_tempdir(request):
-    from distutils.tests.compat import py39 as os_helper
+    from test.support import os_helper
 
     self = request.instance
     self.tempdirs = []

distutils/_modified.py

@@ -9,7 +9,6 @@
 
 from jaraco.functools import splat
 
-from .compat.py39 import zip_strict
 from .errors import DistutilsFileError
 
 _SourcesT = TypeVar(
@@ -57,7 +56,7 @@ def newer_pairwise(
     targets) where source is newer than target, according to the semantics
     of 'newer()'.
     """
-    newer_pairs = filter(splat(newer), zip_strict(sources, targets))
+    newer_pairs = filter(splat(newer), zip(sources, targets, strict=True))
     return tuple(map(list, zip(*newer_pairs, strict=False))) or ([], [])
 
 

distutils/compilers/C/tests/test_unix.py

@@ -7,10 +7,10 @@
 from distutils.compat import consolidate_linker_args
 from distutils.errors import DistutilsPlatformError
 from distutils.tests import support
-from distutils.tests.compat.py39 import EnvironmentVarGuard
 from distutils.util import _clear_cached_macosx_ver
 
 import pytest
+from test.support import os_helper
 
 from .. import unix
 
@@ -238,7 +238,7 @@ def gcvs(*args, _orig=sysconfig.get_config_vars):
 
         sysconfig.get_config_var = gcv
         sysconfig.get_config_vars = gcvs
-        with EnvironmentVarGuard() as env:
+        with os_helper.EnvironmentVarGuard() as env:
             env['CC'] = 'my_cc'
             del env['LDSHARED']
             sysconfig.customize_compiler(self.cc)
@@ -268,7 +268,7 @@ def gcvs(*args, _orig=sysconfig.get_config_vars):
             mock.patch.object(self.cc, 'spawn', return_value=None) as mock_spawn,
             mock.patch.object(self.cc, '_need_link', return_value=True),
             mock.patch.object(self.cc, 'mkpath', return_value=None),
-            EnvironmentVarGuard() as env,
+            os_helper.EnvironmentVarGuard() as env,
         ):
             # override environment overrides in case they're specified by CI
             del env['CXX']
@@ -339,7 +339,7 @@ def gcvs(*args, _orig=sysconfig.get_config_vars):
             mock.patch.object(self.cc, 'spawn', return_value=None) as mock_spawn,
             mock.patch.object(self.cc, '_need_link', return_value=True),
             mock.patch.object(self.cc, 'mkpath', return_value=None),
-            EnvironmentVarGuard() as env,
+            os_helper.EnvironmentVarGuard() as env,
         ):
             env['CC'] = 'ccache my_cc'
             env['CXX'] = 'my_cxx'
@@ -368,7 +368,7 @@ def gcvs(*args, _orig=sysconfig.get_config_vars):
 
         sysconfig.get_config_var = gcv
         sysconfig.get_config_vars = gcvs
-        with EnvironmentVarGuard() as env:
+        with os_helper.EnvironmentVarGuard() as env:
             env['CC'] = 'my_cc'
             env['LDSHARED'] = 'my_ld -bundle -dynamic'
             sysconfig.customize_compiler(self.cc)

distutils/sysconfig.py

@@ -22,7 +22,6 @@
 from jaraco.functools import pass_none
 
 from .ccompiler import CCompiler
-from .compat import py39
 from .errors import DistutilsPlatformError
 from .util import is_mingw
 
@@ -563,7 +562,6 @@ def get_config_vars(*args: str) -> list[str | int] | dict[str, str | int]:
     global _config_vars
     if _config_vars is None:
         _config_vars = sysconfig.get_config_vars().copy()
-        py39.add_ext_suffix(_config_vars)
 
     return [_config_vars.get(name) for name in args] if args else _config_vars
 

distutils/tests/test_build_ext.py

@@ -29,8 +29,7 @@
 import path
 import pytest
 from test import support
-
-from .compat import py39 as import_helper
+from test.support import import_helper
 
 
 @pytest.fixture()

distutils/tests/test_filelist.py

@@ -10,8 +10,7 @@
 
 import jaraco.path
 import pytest
-
-from .compat import py39 as os_helper
+from test.support import os_helper
 
 MANIFEST_IN = """\
 include ok

distutils/tests/test_spawn.py

@@ -10,9 +10,7 @@
 
 import path
 import pytest
-from test.support import unix_shell
-
-from .compat import py39 as os_helper
+from test.support import os_helper, unix_shell
 
 
 class TestSpawn(support.TempdirManager):