Merge branch 'main' into debt/pbr-without-pkg_resources

Author: jaraco

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 80.9.0
+current_version = 81.0.0
 commit = True
 tag = True
 

.github/workflows/main.yml

@@ -83,9 +83,20 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
+        # Workaround for actions/setup-python#981 on macos
+        # Workaround for https://github.com/pypa/setuptools/issues/5143 on windows
+        # (env var only modified for this specific step)
         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' }}
+          SETUPTOOLS_USE_DISTUTILS: >-
+            ${{
+              (
+                ( matrix.platform == 'macos-latest' || matrix.platform == 'windows-latest' )
+                && matrix.python == '3.9'
+                && 'stdlib'
+              )
+              || matrix.distutils
+              || 'local'
+            }}
       - uses: actions/cache@v4
         id: cache
         with:
@@ -169,7 +180,7 @@ jobs:
     - name: Decide whether the needed jobs succeeded or failed
       uses: re-actors/alls-green@release/v1
       with:
-        allowed-skips: integration-test
+        allowed-skips: check-changed-folders, integration-test
         jobs: ${{ toJSON(needs) }}
 
   test_cygwin:
@@ -229,7 +240,7 @@ jobs:
             VM-${{ matrix.platform }},
             Py-${{ steps.python-install.outputs.python-version }}
           token: ${{ secrets.CODECOV_TOKEN }}
-            
+
   check-changed-folders:
     name: Fail the job if files changed under _disutils/_vendor folders
     if: github.event_name == 'pull_request'
@@ -241,13 +252,13 @@ jobs:
           fetch-depth: 0
       - name: Check if files changed in the _distutils folder
         id: changed-files-specific-distutils
-        uses: tj-actions/changed-files@v34
+        uses: tj-actions/changed-files@v46
         with:
           files: |
             setuptools/_distutils/**
       - name: Check if files changed in the _vendor folder
         id: changed-files-specific-vendor
-        uses: tj-actions/changed-files@v34
+        uses: tj-actions/changed-files@v46
         with:
           files: |
             setuptools/_vendor/**
@@ -296,7 +307,10 @@ jobs:
       contents: write
     needs:
     - check
-    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    if: >-  # `always()` prevents auto-cancellation when previous steps are skipped (#5151):
+      always()
+      && needs.check.result == 'success'
+      && github.event_name == 'push' && github.ref_type == 'tag'
     runs-on: ubuntu-latest
     timeout-minutes: 75
     steps:

NEWS.rst

@@ -1,3 +1,52 @@
+v81.0.0
+=======
+
+Deprecations and Removals
+-------------------------
+
+- Removed support for the --dry-run parameter to setup.py. This one feature by its nature threads through lots of core and ancillary functionality, adding complexity and friction. Removal of this parameter will help decouple the compiler functionality from distutils and thus the eventual full integration of distutils. These changes do affect some class and function signatures, so any derivative functionality may require some compatibility shims to support their expected interface. Please report any issues to the Setuptools project for investigation. (#4872)
+
+
+v80.10.2
+========
+
+Bugfixes
+--------
+
+- Update vendored dependencies. (#5159)
+
+
+Misc
+----
+
+- #5115, #5128
+
+
+v80.10.1
+========
+
+Misc
+----
+
+- #5152
+
+
+v80.10.0
+========
+
+Features
+--------
+
+- Remove post-release tags on setuptools' own build. (#4530)
+- Refreshed vendored dependencies. (#5139)
+
+
+Misc
+----
+
+- #5033
+
+
 v80.9.0
 =======
 
@@ -329,6 +378,15 @@ Bugfixes
 - Restore ``distutils.ccompiler.compiler_class`` -- by :user:`Avasam` (#4876)
 
 
+v75.3.3
+=======
+
+Bugfixes
+--------
+
+- Backported security fix for package index to 75.3.x for Python 3.8. (#5009)
+
+
 v75.3.2
 =======
 

docs/userguide/pyproject_config.rst

@@ -99,6 +99,7 @@ Key                       Value Type (TOML)           Notes
 ``ext-modules``           array of                    **Experimental** - Each item corresponds to a
                           tables/inline-tables        :class:`setuptools.Extension` object and may define
                                                       the associated parameters in :wiki:`kebab-case`.
+                                                      See :doc:`/userguide/ext_modules`.
 ``packages``              array or ``find`` directive See tip below.
 ``package-dir``           table/inline-table          Used when explicitly/manually listing ``packages``.
 ------------------------- --------------------------- -------------------------

newsfragments/4530.feature.rst

@@ -10,7 +10,7 @@ backend-path = ["."]
 
 [project]
 name = "setuptools"
-version = "80.9.0"
+version = "81.0.0"
 authors = [
 	{ name = "Python Packaging Authority", email = "distutils-sig@python.org" },
 ]
@@ -117,8 +117,8 @@ check = [
 
 	# local
 
-	# Removal of deprecated UP027, PT004 & PT005 astral-sh/ruff#14383
-	"ruff >= 0.8.0; sys_platform != 'cygwin'",
+	# Deprecated rules must now be selected by exact rule code
+	"ruff >= 0.13.0; sys_platform != 'cygwin'",
 ]
 
 cover = [
@@ -138,7 +138,7 @@ type = [
 	# pin mypy version so a new version doesn't suddenly cause the CI to fail,
 	# until types-setuptools is removed from typeshed.
 	# For help with static-typing issues, or mypy update, ping @Avasam
-	"mypy==1.14.*",
+	"mypy==1.18.*",
 	# Typing fixes in version newer than we require at runtime
 	"importlib_metadata>=7.0.2; python_version < '3.10'",
 	# Imported unconditionally in tools/finalize.py

newsfragments/5033.misc.rst

@@ -65,14 +65,14 @@ ignore = [
 	"TRY003", # raise-vanilla-args, avoid multitude of exception classes
 	"TRY301", # raise-within-try, it's handy
 	"UP015", # redundant-open-modes, explicit is preferred
-	"UP038", # Using `X | Y` in `isinstance` call is slower and more verbose https://github.com/astral-sh/ruff/issues/7871
 	# Only enforcing return type annotations for public functions
 	"ANN202", # missing-return-type-private-function
 ]
 
 [lint.per-file-ignores]
 # Suppress nuisance warnings about module-import-not-at-top-of-file (E402) due to workaround for #4476
 "setuptools/__init__.py" = ["E402"]
+# pkg_resources is due for removal, not worth fixing existing errors
 "pkg_resources/__init__.py" = ["E402", "ANN204"]
 "pkg_resources/tests/test_resources.py" = ["PT031"]
 

pyproject.toml

@@ -24,7 +24,8 @@ class install_with_pth(install):
 
     _pth_name = 'distutils-precedence'
     _pth_contents = (
-        textwrap.dedent(
+        textwrap
+        .dedent(
             """
         import os
         var = 'SETUPTOOLS_USE_DISTUTILS'

ruff.toml

@@ -167,6 +167,12 @@ class Command(_Command):
     command_consumes_arguments = False
     distribution: Distribution  # override distutils.dist.Distribution with setuptools.dist.Distribution
 
+    dry_run = False  # type: ignore[assignment] # pyright: ignore[reportAssignmentType] (until #4689; see #4872)
+    """
+    For compatibility with vendored bdist_wheel.
+    https://github.com/pypa/setuptools/pull/4872/files#r1986395142
+    """
+
     def __init__(self, dist: Distribution, **kw) -> None:
         """
         Construct the command for dist, updating