Merge branch 'main' into feature/dead-code-removal

Author: jaraco

.bumpversion.cfg

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

.github/dependabot.yml

@@ -13,6 +13,6 @@ Closes <!-- issue number here -->
   _(See [documentation][PR docs] for details)_
 
 
-[`newsfragments/`]: https://github.com/pypa/setuptools/tree/master/newsfragments
+[`newsfragments/`]: https://github.com/pypa/setuptools/tree/main/newsfragments
 [PR docs]:
 https://setuptools.pypa.io/en/latest/development/developer-guide.html#making-a-pull-request

.github/pull_request_template.md

@@ -28,7 +28,6 @@ env:
 
   # Suppress noisy pip warnings
   PIP_DISABLE_PIP_VERSION_CHECK: 'true'
-  PIP_NO_PYTHON_VERSION_WARNING: 'true'
   PIP_NO_WARN_SCRIPT_LOCATION: 'true'
 
   # Ensure tests can sense settings about the environment
@@ -42,15 +41,13 @@ jobs:
       # https://blog.jaraco.com/efficient-use-of-ci-resources/
       matrix:
         python:
-        - "3.8"
+        - "3.9"
         - "3.13"
         platform:
         - ubuntu-latest
         - macos-latest
         - windows-latest
         include:
-        - python: "3.9"
-          platform: ubuntu-latest
         - python: "3.10"
           platform: ubuntu-latest
         - python: "3.11"
@@ -65,25 +62,30 @@ jobs:
         - platform: ubuntu-latest
           python: "3.10"
           distutils: stdlib
-        # Python 3.8, 3.9 are on macos-13 but not macos-latest (macos-14-arm64)
-        # https://github.com/actions/setup-python/issues/850
-        # https://github.com/actions/setup-python/issues/696#issuecomment-1637587760
-        - {python: "3.8", platform: "macos-13"}
-        exclude:
-        - {python: "3.8", platform: "macos-latest"}
     runs-on: ${{ matrix.platform }}
-    continue-on-error: ${{ matrix.python == '3.14' }}
+    continue-on-error: ${{ matrix.python == '3.14' || matrix.python == 'pypy3.10' }}
+    # XXX: pypy seems to be flaky with unrelated tests in #6345
     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:
@@ -95,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: |
@@ -151,6 +157,7 @@ jobs:
     if: always()
 
     needs:
+    - check-changed-folders
     - integration-test
     - test
     - collateral
@@ -183,7 +190,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
@@ -194,11 +201,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: |
@@ -216,6 +229,38 @@ 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'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Check if files changed in the _distutils folder
+        id: changed-files-specific-distutils
+        uses: tj-actions/changed-files@v34
+        with:
+          files: |
+            setuptools/_distutils/**
+      - name: Check if files changed in the _vendor folder
+        id: changed-files-specific-vendor
+        uses: tj-actions/changed-files@v34
+        with:
+          files: |
+            setuptools/_vendor/**
+      - name: Fail the job if any file(s) in the _distutils folder change
+        if: steps.changed-files-specific-distutils.outputs.any_changed == 'true'
+        run: |
+          echo "One or more files in the setuptools/_distutils folder has changed." | tee "${GITHUB_STEP_SUMMARY}"
+          exit 1      
+      - name: Fail the job if any file(s) in the _vendor folder change
+        if: steps.changed-files-specific-vendor.outputs.any_changed == 'true'
+        run: |
+          echo "One or more files in the setuptools/_vendor folder has changed." | tee "${GITHUB_STEP_SUMMARY}"
+          exit 1 
 
   integration-test:
     needs: test

.github/workflows/main.yml

@@ -26,7 +26,7 @@ env:
   # For help with static-typing issues, or pyright update, ping @Avasam
   #
   # An exact version from https://github.com/microsoft/pyright/releases or "latest"
-  PYRIGHT_VERSION: "1.1.377"
+  PYRIGHT_VERSION: "1.1.385"
 
   # Environment variable to support color support (jaraco/skeleton#66)
   FORCE_COLOR: 1
@@ -42,8 +42,8 @@ jobs:
       # https://blog.jaraco.com/efficient-use-of-ci-resources/
       matrix:
         python:
-          - "3.8"
-          - "3.12"
+          - "3.9"
+          - "3.13"
         platform:
           - ubuntu-latest
     runs-on: ${{ matrix.platform }}
@@ -73,4 +73,5 @@ jobs:
         uses: jakebailey/pyright-action@v2
         with:
           version: ${{ env.PYRIGHT_VERSION }}
+          python-version: ${{ matrix.python }}
           extra-args: --threads

.github/workflows/pyright.yml

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

.pre-commit-config.yaml

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