Merge branch 'main' into importlib_machinery

Author: Avasam

.github/workflows/main.yml

@@ -4,7 +4,8 @@ on:
   merge_group:
   push:
     branches-ignore:
-    - gh-readonly-queue/**  # Temporary merge queue-related GH-made branches
+    # disabled for jaraco/skeleton#103
+    # - gh-readonly-queue/**  # Temporary merge queue-related GH-made branches
   pull_request:
   workflow_dispatch:
 

README.rst

@@ -27,10 +27,9 @@
    :target: https://discord.com/channels/803025117553754132/815945031150993468
    :alt: Discord
 
-See the `Installation Instructions
-<https://packaging.python.org/installing/>`_ in the Python Packaging
-User's Guide for instructions on installing, upgrading, and uninstalling
-Setuptools.
+See the `Quickstart <https://setuptools.pypa.io/en/latest/userguide/quickstart.html>`_
+and the `User's Guide <https://setuptools.pypa.io/en/latest/userguide/>`_ for
+instructions on how to use Setuptools.
 
 Questions and comments should be directed to `GitHub Discussions
 <https://github.com/pypa/setuptools/discussions>`_.

docs/userguide/miscellaneous.rst

@@ -35,7 +35,7 @@ Please note that the list above is guaranteed to work with the last stable versi
 of ``setuptools``. The behavior of older versions might differ.
 
 .. note::
-   .. versionadded:: v68.3.0
+   .. versionadded:: v69.0.0
       ``setuptools`` will attempt to include type information files
       by default in the distribution
       (``.pyi`` and ``py.typed``, as specified in :pep:`561`).

newsfragments/4182.doc.rst

@@ -0,0 +1 @@
+Changed ``versionadded`` for "Type information included by default" feature from ``v68.3.0`` to ``v69.0.0`` -- by :user:Avasam`

pkg_resources/__init__.py

@@ -400,20 +400,18 @@ def get_provider(moduleOrReq):
     return _find_adapter(_provider_factories, loader)(module)
 
 
-def _macos_vers(_cache=[]):
-    if not _cache:
-        version = platform.mac_ver()[0]
-        # fallback for MacPorts
-        if version == '':
-            plist = '/System/Library/CoreServices/SystemVersion.plist'
-            if os.path.exists(plist):
-                if hasattr(plistlib, 'readPlist'):
-                    plist_content = plistlib.readPlist(plist)
-                    if 'ProductVersion' in plist_content:
-                        version = plist_content['ProductVersion']
-
-        _cache.append(version.split('.'))
-    return _cache[0]
+@functools.lru_cache(maxsize=None)
+def _macos_vers():
+    version = platform.mac_ver()[0]
+    # fallback for MacPorts
+    if version == '':
+        plist = '/System/Library/CoreServices/SystemVersion.plist'
+        if os.path.exists(plist):
+            with open(plist, 'rb') as fh:
+                plist_content = plistlib.load(fh)
+            if 'ProductVersion' in plist_content:
+                version = plist_content['ProductVersion']
+    return version.split('.')
 
 
 def _macos_arch(machine):
@@ -1888,7 +1886,7 @@ def _extract_resource(self, manager, zip_path):  # noqa: C901
             try:
                 rename(tmpnam, real_path)
 
-            except os.error:
+            except OSError:
                 if os.path.isfile(real_path):
                     if self._is_current(real_path, zip_path):
                         # the file became current since it was checked above,
@@ -1901,7 +1899,7 @@ def _extract_resource(self, manager, zip_path):  # noqa: C901
                         return real_path
                 raise
 
-        except os.error:
+        except OSError:
             # report a user-friendly error
             manager.extraction_error()
 
@@ -2415,12 +2413,9 @@ def _cygwin_patch(filename):  # pragma: nocover
     return os.path.abspath(filename) if sys.platform == 'cygwin' else filename
 
 
-def _normalize_cached(filename, _cache={}):
-    try:
-        return _cache[filename]
-    except KeyError:
-        _cache[filename] = result = normalize_path(filename)
-        return result
+@functools.lru_cache(maxsize=None)
+def _normalize_cached(filename):
+    return normalize_path(filename)
 
 
 def _is_egg_path(path):
@@ -2894,7 +2889,7 @@ def __getattr__(self, attr):
 
     def __dir__(self):
         return list(
-            set(super(Distribution, self).__dir__())
+            set(super().__dir__())
             | set(attr for attr in self._provider.__dir__() if not attr.startswith('_'))
         )
 
@@ -3161,7 +3156,7 @@ class RequirementParseError(packaging.requirements.InvalidRequirement):
 class Requirement(packaging.requirements.Requirement):
     def __init__(self, requirement_string):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
-        super(Requirement, self).__init__(requirement_string)
+        super().__init__(requirement_string)
         self.unsafe_name = self.name
         project_name = safe_name(self.name)
         self.project_name, self.key = project_name, project_name.lower()

pkg_resources/tests/test_pkg_resources.py

@@ -1,9 +1,11 @@
+import builtins
 import sys
 import tempfile
 import os
 import zipfile
 import datetime
 import time
+import plistlib
 import subprocess
 import stat
 import distutils.dist
@@ -323,6 +325,32 @@ def test_dist_info_is_not_dir(tmp_path, only):
     assert not pkg_resources.dist_factory(str(tmp_path), str(dist_info), only)
 
 
+def test_macos_vers_fallback(monkeypatch, tmp_path):
+    """Regression test for pkg_resources._macos_vers"""
+    orig_open = builtins.open
+
+    # Pretend we need to use the plist file
+    monkeypatch.setattr('platform.mac_ver', mock.Mock(return_value=('', (), '')))
+
+    # Create fake content for the fake plist file
+    with open(tmp_path / 'fake.plist', 'wb') as fake_file:
+        plistlib.dump({"ProductVersion": "11.4"}, fake_file)
+
+    # Pretend the fake file exists
+    monkeypatch.setattr('os.path.exists', mock.Mock(return_value=True))
+
+    def fake_open(file, *args, **kwargs):
+        return orig_open(tmp_path / 'fake.plist', *args, **kwargs)
+
+    # Ensure that the _macos_vers works correctly
+    with mock.patch('builtins.open', mock.Mock(side_effect=fake_open)) as m:
+        pkg_resources._macos_vers.cache_clear()
+        assert pkg_resources._macos_vers() == ["11", "4"]
+        pkg_resources._macos_vers.cache_clear()
+
+    m.assert_called()
+
+
 class TestDeepVersionLookupDistutils:
     @pytest.fixture
     def env(self, tmpdir):

pkg_resources/tests/test_working_set.py

@@ -76,10 +76,10 @@ def parametrize_test_working_set_resolve(*test_list):
             requirements,
             expected1,
             expected2,
-        ) = [
+        ) = (
             strip_comments(s.lstrip())
             for s in textwrap.dedent(test).lstrip().split('\n\n', 5)
-        ]
+        )
         installed_dists = list(parse_distributions(installed_dists))
         installable_dists = list(parse_distributions(installable_dists))
         requirements = list(pkg_resources.parse_requirements(requirements))

ruff.toml

@@ -1,5 +1,5 @@
 [lint]
-extend-ignore = [
+ignore = [
 	# https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
 	"W191",
 	"E111",
@@ -16,7 +16,27 @@ extend-ignore = [
 	"ISC001",
 	"ISC002",
 ]
+extend-select = [
+	"UP",  # pyupgrade
+]
+extend-ignore = [
+	"UP015",  # redundant-open-modes, explicit is prefered
+	"UP030",  # temporarily disabled
+	"UP031",  # temporarily disabled
+	"UP032",  # temporarily disabled
+	"UP036",  # temporarily disabled
+]
+exclude = [
+	"**/_vendor",
+	"setuptools/_distutils",
+	"setuptools/config/_validate_pyproject",
+]
 
 [format]
+exclude = [
+	"**/_vendor",
+	"setuptools/_distutils",
+	"setuptools/config/_validate_pyproject",
+]
 # https://docs.astral.sh/ruff/settings/#format-quote-style
 quote-style = "preserve"

setuptools/build_meta.py

@@ -121,7 +121,7 @@ def _file_with_extension(directory, extension):
         raise ValueError(
             'No distribution was found. Ensure that `setup.py` '
             'is not empty and that it calls `setup()`.'
-        )
+        ) from None
     return file
 
 
@@ -130,7 +130,7 @@ def _open_setup_script(setup_script):
         # Supply a default setup.py
         return io.StringIO("from setuptools import setup; setup()")
 
-    return getattr(tokenize, 'open', open)(setup_script)
+    return tokenize.open(setup_script)
 
 
 @contextlib.contextmanager
@@ -477,7 +477,7 @@ def run_setup(self, setup_script='setup.py'):
         sys.argv[0] = setup_script
 
         try:
-            super(_BuildMetaLegacyBackend, self).run_setup(setup_script=setup_script)
+            super().run_setup(setup_script=setup_script)
         finally:
             # While PEP 517 frontends should be calling each hook in a fresh
             # subprocess according to the standard (and thus it should not be

setuptools/command/bdist_egg.py

@@ -321,8 +321,7 @@ def walk_egg(egg_dir):
     if 'EGG-INFO' in dirs:
         dirs.remove('EGG-INFO')
     yield base, dirs, files
-    for bdf in walker:
-        yield bdf
+    yield from walker
 
 
 def analyze_egg(egg_dir, stubs):
@@ -406,14 +405,12 @@ def scan_module(egg_dir, base, name, stubs):
 
 def iter_symbols(code):
     """Yield names and strings used by `code` and its nested code objects"""
-    for name in code.co_names:
-        yield name
+    yield from code.co_names
     for const in code.co_consts:
         if isinstance(const, str):
             yield const
         elif isinstance(const, CodeType):
-            for name in iter_symbols(const):
-                yield name
+            yield from iter_symbols(const)
 
 
 def can_scan():