Merge failing test into fix_msvc_host_dir_arm64.

Author: jaraco

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 75.6.0
+current_version = 76.0.0
 commit = True
 tag = True
 

.github/dependabot.yml

@@ -63,22 +63,29 @@ jobs:
         - platform: ubuntu-latest
           python: "3.10"
           distutils: stdlib
-        # TODO: Re-evaluate the need for the following workaround
-        exclude:
-        - {python: "3.9", platform: "macos-latest"}  # actions/setup-python#981
     runs-on: ${{ matrix.platform }}
     continue-on-error: ${{ matrix.python == '3.14' }}
     env:
       SETUPTOOLS_USE_DISTUTILS: ${{ matrix.distutils || 'local' }}
     timeout-minutes: 75
     steps:
       - uses: actions/checkout@v4
+      - name: Install build dependencies
+        # Install dependencies for building packages on pre-release Pythons
+        # jaraco/skeleton#161
+        if: matrix.python == '3.14' && matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt update
+          sudo apt install -y libxml2-dev libxslt-dev
       - name: Setup Python
         id: python-install
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
+        env:
+          # Workaround for actions/setup-python#981 (env var only modified for this specific step)
+          SETUPTOOLS_USE_DISTUTILS: ${{ matrix.platform == 'macos-latest' && matrix.python == '3.9' && 'stdlib' || matrix.distutils || 'local' }}
       - uses: actions/cache@v4
         id: cache
         with:
@@ -90,6 +97,10 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         working-directory: setuptools/tests/config
         run: python -m downloads.preload setupcfg_examples.txt
+      - name: Adjust env vars
+        shell: bash
+        run: |
+          echo 'PIPX_DEFAULT_PYTHON=${{ steps.python-install.outputs.python-path }}' >> $GITHUB_ENV
       - name: Pre-build distributions for test
         shell: bash
         run: |
@@ -178,7 +189,7 @@ jobs:
           packages: >-
             python${{ matrix.python }},
             python${{ matrix.python }}-devel,
-            python${{ matrix.python }}-tox,
+            python${{ matrix.python }}-pip,
             gcc-core,
             git,
       - name: Record the currently selected Python version
@@ -189,11 +200,17 @@ jobs:
         run: |
           python -c 'import platform; print("python-version=" + platform.python_version())' >> ${GITHUB_OUTPUT}
         shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0}
+      - name: Install tox using pip
+        shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0}
+        run: |
+          # Workaround for https://github.com/pypa/setuptools/issues/4831
+          python -m pip install tox
       - name: Run tests
         shell: C:\cygwin\bin\env.exe CYGWIN_NOWINPATH=1 CHERE_INVOKING=1 C:\cygwin\bin\bash.exe -leo pipefail -o igncr {0}
         run: |
-          git config --global --add safe.directory "$(cygpath -u "$GITHUB_WORKSPACE")" # workaround for #3408
-          tox
+          git config --global --add safe.directory "$(cygpath -u "${{ github.workspace }}")" # workaround for #3408
+          echo "$(cygpath -u "${{ github.workspace }}")" # for debugging purposes
+          python -m tox
       - name: Create coverage report
         if: hashFiles('.coverage') != ''  # Rudimentary `file.exists()`
         run: |

.github/workflows/main.yml

@@ -5,6 +5,9 @@ python:
     extra_requirements:
       - doc
 
+sphinx:
+  configuration: docs/conf.py
+
 # required boilerplate readthedocs/readthedocs.org#10401
 build:
   os: ubuntu-lts-latest

.readthedocs.yaml

@@ -1,3 +1,88 @@
+v75.3.2
+=======
+
+- Fixed version error in changelog.
+
+
+v75.3.1
+=======
+
+Bugfixes
+--------
+
+- Fix wheel file naming to follow binary distribution specification -- by :user:`di` (#4877)
+
+
+v76.0.0
+=======
+
+Deprecations and Removals
+-------------------------
+
+- Synced with pypa/distutils@5589d7527 including a simplified shebang generation when building scripts (#4863). (#4865)
+
+
+v75.9.1
+=======
+
+Bugfixes
+--------
+
+- Fix ImportError in distutils when configuring for linking. (#4866)
+
+
+v75.9.0
+=======
+
+Features
+--------
+
+- Synced with pypa/distutils@91f75bb98 including exporting of PyInit_pkg (pypa/distutils#327) and a refactoring of the compiler classes into distutils.compilers (pypa/distutils#295). (#4852)
+
+
+v75.8.2
+=======
+
+Bugfixes
+--------
+
+- Fixed ``pkg_resources.require(...)`` to also consider standardised
+  ``dist-info`` directories. (#4856)
+
+
+v75.8.1
+=======
+
+Bugfixes
+--------
+
+- Fix wheel file naming to follow binary distribution specification -- by :user:`di` (#4766)
+- Fixed crash generating error message printed when building wheels for the
+  free-threaded build using the limited API. -- by :user:`ngoldbaum` (#4809)
+- Fix documentation for recent CFLAGS distutils change. -- by :user:`thesamesam` (#4836)
+
+
+v75.8.0
+=======
+
+Features
+--------
+
+- Implemented ``Dynamic`` field for core metadata (as introduced in PEP 643).
+  The existing implementation is currently experimental and the exact approach
+  may change in future releases. (#4698)
+
+
+v75.7.0
+=======
+
+Features
+--------
+
+- Synced with pypa/distutils@c97a3db2f including better support for free threaded Python on Windows (pypa/distutils#310), improved typing support, and linter accommodations. (#4478)
+- Synced with pypa/distutils@ff11eed0c including bugfix for duplicate CFLAGS and adaption to support Python 3.13 is_abs in the C compiler (#4669). (#4790)
+
+
 v75.6.0
 =======
 
@@ -599,7 +684,7 @@ Bugfixes
 --------
 
 - In tests, rely on pytest-home for reusable fixture. (#4072)
-- Explicitely marked as ``Protocol`` and fixed missing ``self`` argument in interfaces ``pkg_resources.IMetadataProvider`` and ``pkg_resources.IResourceProvider`` -- by :user:`Avasam` (#4144)
+- Explicitly marked as ``Protocol`` and fixed missing ``self`` argument in interfaces ``pkg_resources.IMetadataProvider`` and ``pkg_resources.IResourceProvider`` -- by :user:`Avasam` (#4144)
 - Restored expectation that egg-link files would be named with dash separators for compatibility with pip prior to version 24. (#4167)
 
 
@@ -7130,7 +7215,7 @@ setuptools
 
 * Fixed invalid URL error catching. Old Setuptools #20.
 
-* Fixed invalid bootstraping with easy_install installation (Distribute #40).
+* Fixed invalid bootstrapping with easy_install installation (Distribute #40).
   Thanks to Florian Schulze for the help.
 
 * Removed buildout/bootstrap.py. A new repository will create a specific

NEWS.rst

@@ -14,7 +14,7 @@
 .. |docs-badge| image:: https://img.shields.io/readthedocs/setuptools/latest.svg
    :target: https://setuptools.pypa.io
 
-.. |skeleton-badge| image:: https://img.shields.io/badge/skeleton-2024-informational
+.. |skeleton-badge| image:: https://img.shields.io/badge/skeleton-2025-informational
    :target: https://blog.jaraco.com/skeleton
 
 .. |codecov-badge| image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg?logo=codecov&logoColor=white

README.rst

@@ -136,6 +136,9 @@
         "color-brand-primary": "#E5B62F",  # "yellow"
         "color-brand-content": "#E5B62F",
     },
+    "source_repository": "https://github.com/pypa/setuptools/",
+    "source_branch": "main",
+    "source_directory": "docs/",
 }
 
 # Redirect old docs so links and references in the ecosystem don't break

docs/conf.py

@@ -110,8 +110,7 @@ The compiler options appear in the command line in the following order:
 
 .. Reference: "compiler_so" and distutils.ccompiler.gen_preprocess_options, CCompiler.compile, UnixCCompiler._compile
 
-* first, the options provided by the ``sysconfig`` variable ``CFLAGS``,
-* then, the options provided by the environment variables ``CFLAGS`` and ``CPPFLAGS``,
+* first, the options provided by the environment variables ``CFLAGS`` and ``CPPFLAGS``,
 * then, the options provided by the ``sysconfig`` variable ``CCSHARED``,
 * then, a ``-I`` option for each element of ``Extension.include_dirs``,
 * finally, the options provided by ``Extension.extra_compile_args``.

docs/userguide/ext_modules.rst

@@ -708,14 +708,19 @@ def find(self, req: Requirement) -> Distribution | None:
         If there is no active distribution for the requested project, ``None``
         is returned.
         """
-        dist = self.by_key.get(req.key)
+        dist: Distribution | None = None
 
-        if dist is None:
-            canonical_key = self.normalized_to_canonical_keys.get(req.key)
+        candidates = (
+            req.key,
+            self.normalized_to_canonical_keys.get(req.key),
+            safe_name(req.key).replace(".", "-"),
+        )
 
-            if canonical_key is not None:
-                req.key = canonical_key
-                dist = self.by_key.get(canonical_key)
+        for candidate in filter(None, candidates):
+            dist = self.by_key.get(candidate)
+            if dist:
+                req.key = candidate
+                break
 
         if dist is not None and dist not in req:
             # XXX add more info
@@ -873,9 +878,7 @@ def resolve(
 
         # Mapping of requirement to set of distributions that required it;
         # useful for reporting info about conflicts.
-        required_by: collections.defaultdict[Requirement, set[str]] = (
-            collections.defaultdict(set)
-        )
+        required_by = collections.defaultdict[Requirement, set[str]](set)
 
         while requirements:
             # process dependencies breadth-first

newsfragments/4478.feature.rst

@@ -2,6 +2,7 @@
 
 import builtins
 import datetime
+import inspect
 import os
 import plistlib
 import stat
@@ -425,3 +426,60 @@ def test_normalize_path_backslash_sep(self, unnormalized, expected):
         """Ensure path seps are cleaned on backslash path sep systems."""
         result = pkg_resources.normalize_path(unnormalized)
         assert result.endswith(expected)
+
+
+class TestWorkdirRequire:
+    def fake_site_packages(self, tmp_path, monkeypatch, dist_files):
+        site_packages = tmp_path / "site-packages"
+        site_packages.mkdir()
+        for file, content in self.FILES.items():
+            path = site_packages / file
+            path.parent.mkdir(exist_ok=True, parents=True)
+            path.write_text(inspect.cleandoc(content), encoding="utf-8")
+
+        monkeypatch.setattr(sys, "path", [site_packages])
+        return os.fspath(site_packages)
+
+    FILES = {
+        "pkg1_mod-1.2.3.dist-info/METADATA": """
+            Metadata-Version: 2.4
+            Name: pkg1.mod
+            Version: 1.2.3
+            """,
+        "pkg2.mod-0.42.dist-info/METADATA": """
+            Metadata-Version: 2.1
+            Name: pkg2.mod
+            Version: 0.42
+            """,
+        "pkg3_mod.egg-info/PKG-INFO": """
+            Name: pkg3.mod
+            Version: 1.2.3.4
+            """,
+        "pkg4.mod.egg-info/PKG-INFO": """
+            Name: pkg4.mod
+            Version: 0.42.1
+            """,
+    }
+
+    @pytest.mark.parametrize(
+        ("version", "requirement"),
+        [
+            ("1.2.3", "pkg1.mod>=1"),
+            ("0.42", "pkg2.mod>=0.4"),
+            ("1.2.3.4", "pkg3.mod<=2"),
+            ("0.42.1", "pkg4.mod>0.2,<1"),
+        ],
+    )
+    def test_require_non_normalised_name(
+        self, tmp_path, monkeypatch, version, requirement
+    ):
+        # https://github.com/pypa/setuptools/issues/4853
+        site_packages = self.fake_site_packages(tmp_path, monkeypatch, self.FILES)
+        ws = pkg_resources.WorkingSet([site_packages])
+
+        for req in [requirement, requirement.replace(".", "-")]:
+            [dist] = ws.require(req)
+            assert dist.version == version
+            assert os.path.samefile(
+                os.path.commonpath([dist.location, site_packages]), site_packages
+            )

pkg_resources/__init__.py

@@ -104,9 +104,13 @@ def parametrize_test_working_set_resolve(*test_list):
                 )
             )
     return pytest.mark.parametrize(
-        'installed_dists,installable_dists,'
-        'requirements,replace_conflicting,'
-        'resolved_dists_or_exception',
+        (
+            "installed_dists",
+            "installable_dists",
+            "requirements",
+            "replace_conflicting",
+            "resolved_dists_or_exception",
+        ),
         argvalues,
         ids=idlist,
     )

pkg_resources/tests/test_pkg_resources.py

@@ -5,7 +5,7 @@ backend-path = ["."]
 
 [project]
 name = "setuptools"
-version = "75.6.0"
+version = "76.0.0"
 authors = [
 	{ name = "Python Packaging Authority", email = "[email protected]" },
 ]