Merge branch 'main' into re-enable-mypy

Author: Avasam

distutils/ccompiler.py

@@ -1,6 +1,9 @@
+from .compat.numpy import (  # noqa: F401
+    _default_compilers,
+    compiler_class,
+)
 from .compilers.C import base
 from .compilers.C.base import (
-    compiler_class,
     gen_lib_options,
     gen_preprocess_options,
     get_default_compiler,
@@ -12,7 +15,6 @@
 __all__ = [
     'CompileError',
     'LinkError',
-    'compiler_class',
     'gen_lib_options',
     'gen_preprocess_options',
     'get_default_compiler',

distutils/command/install.py

@@ -4,6 +4,7 @@
 
 from __future__ import annotations
 
+import collections
 import contextlib
 import itertools
 import os
@@ -13,8 +14,6 @@
 from site import USER_BASE, USER_SITE
 from typing import ClassVar
 
-import jaraco.collections
-
 from ..core import Command
 from ..debug import DEBUG
 from ..errors import DistutilsOptionError, DistutilsPlatformError
@@ -145,7 +144,7 @@ def _resolve_scheme(name):
     try:
         resolved = sysconfig.get_preferred_scheme(key)
     except Exception:
-        resolved = fw.scheme(_pypy_hack(name))
+        resolved = fw.scheme(name)
     return resolved
 
 
@@ -162,7 +161,7 @@ def _inject_headers(name, scheme):
     """
     # Bypass the preferred scheme, which may not
     # have defined headers.
-    fallback = _load_scheme(_pypy_hack(name))
+    fallback = _load_scheme(name)
     scheme.setdefault('headers', fallback['headers'])
     return scheme
 
@@ -172,14 +171,6 @@ def _scheme_attrs(scheme):
     return {f'install_{key}': scheme[key] for key in SCHEME_KEYS}
 
 
-def _pypy_hack(name):
-    PY37 = sys.version_info < (3, 8)
-    old_pypy = hasattr(sys, 'pypy_version_info') and PY37
-    prefix = not name.endswith(('_user', '_home'))
-    pypy_name = 'pypy' + '_nt' * (os.name == 'nt')
-    return pypy_name if old_pypy and prefix else name
-
-
 class install(Command):
     description = "install everything from build directory"
 
@@ -432,12 +423,12 @@ def finalize_options(self) -> None:  # noqa: C901
             local_vars['userbase'] = self.install_userbase
             local_vars['usersite'] = self.install_usersite
 
-        self.config_vars = jaraco.collections.DictStack([
-            fw.vars(),
-            compat_vars,
-            sysconfig.get_config_vars(),
+        self.config_vars = collections.ChainMap(
             local_vars,
-        ])
+            sysconfig.get_config_vars(),
+            compat_vars,
+            fw.vars(),
+        )
 
         self.expand_basedirs()
 

distutils/compat/numpy.py

@@ -0,0 +1,2 @@
+# required for older numpy versions on Pythons prior to 3.12; see pypa/setuptools#4876
+from ..compilers.C.base import _default_compilers, compiler_class  # noqa: F401

distutils/compilers/C/unix.py

@@ -323,7 +323,7 @@ def _is_gcc(self):
         compiler = os.path.basename(shlex.split(cc_var)[0])
         return "gcc" in compiler or "g++" in compiler
 
-    def runtime_library_dir_option(self, dir: str) -> str | list[str]:
+    def runtime_library_dir_option(self, dir: str) -> str | list[str]:  # type: ignore[override] # Fixed in pypa/distutils#339
         # XXX Hackish, at the very least.  See Python bug #445902:
         # https://bugs.python.org/issue445902
         # Linkers on different platforms need different options to

distutils/sysconfig.py

@@ -156,8 +156,6 @@ def _extant(path):
 
 
 def _get_python_inc_posix(prefix, spec_prefix, plat_specific):
-    if IS_PYPY and sys.version_info < (3, 8):
-        return os.path.join(prefix, 'include')
     return (
         _get_python_inc_posix_python(plat_specific)
         or _extant(_get_python_inc_from_config(plat_specific, spec_prefix))

mypy.ini

@@ -13,6 +13,7 @@ explicit_package_bases = True
 disable_error_code =
 	# Disable due to many false positives
 	overload-overlap,
+
 # local
 
 	# TODO: Resolve and re-enable these gradually

newsfragments/4876.bugfix.2.rst

@@ -0,0 +1 @@
+Restore `distutils.ccompiler._default_compilers` -- by :user:`ManiacDC`

pyproject.toml

@@ -22,7 +22,6 @@ dependencies = [
 	"packaging",
 	"jaraco.functools >= 4",
 	"more_itertools",
-	"jaraco.collections",
 ]
 dynamic = ["version"]