Merge branch 'main' into patch-2

Author: jaraco

.coveragerc

@@ -12,6 +12,8 @@ disable_warnings =
 [report]
 show_missing = True
 exclude_also =
-	# jaraco/skeleton#97
-	@overload
+	# Exclude common false positives per
+	# https://coverage.readthedocs.io/en/latest/excluding.html#advanced-exclusion
+	# Ref jaraco/skeleton#97 and jaraco/skeleton#135
+	class .*\bProtocol\):
 	if TYPE_CHECKING:

.github/dependabot.yml

@@ -10,6 +10,7 @@ on:
     # required if branches-ignore is supplied (jaraco/skeleton#103)
     - '**'
   pull_request:
+  workflow_dispatch:
 
 concurrency:
   group: >-
@@ -40,25 +41,34 @@ jobs:
       # https://blog.jaraco.com/efficient-use-of-ci-resources/
       matrix:
         python:
-        - "3.8"
-        - "3.12"
+        - "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"
           platform: ubuntu-latest
+        - python: "3.12"
+          platform: ubuntu-latest
+        - python: "3.14"
+          platform: ubuntu-latest
         - python: pypy3.10
           platform: ubuntu-latest
     runs-on: ${{ matrix.platform }}
-    continue-on-error: ${{ matrix.python == '3.13' }}
+    continue-on-error: ${{ matrix.python == '3.14' }}
     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
         uses: actions/setup-python@v4
         with:
@@ -92,8 +102,6 @@ jobs:
         run: tox -e ${{ matrix.job }}
 
   test_cygwin:
-    # disabled due to lack of Rust support pypa/setuptools#3921
-    if: ${{ false }}
     strategy:
       matrix:
         python:
@@ -111,15 +119,20 @@ jobs:
             python${{ matrix.python }},
             python${{ matrix.python }}-devel,
             python${{ matrix.python }}-pytest,
-            python${{ matrix.python }}-tox,
+            python${{ matrix.python }}-pip,
             gcc-core,
             gcc-g++,
             zlib-devel,
             ncompress
             git
+      - 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: tox
+        run: python -m tox
 
   test_msys2_mingw:
     strategy:
@@ -144,6 +157,9 @@ jobs:
             git
       - name: Install Dependencies
         shell: msys2 {0}
+        env:
+          CC: ${{ matrix.cc }}
+          CXX: ${{ matrix.cxx }}
         run: |
           export VIRTUALENV_NO_SETUPTOOLS=1
 
@@ -163,6 +179,28 @@ jobs:
           source /tmp/venv/bin/activate
           pytest
 
+  test_msvc_python_mingw:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.12
+      - name: Install tox
+        run: python -m pip install tox
+      - name: Install GCC
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: ucrt64
+          install: mingw-w64-ucrt-x86_64-cc
+      - name: Run
+        run: |
+          $env:MSYS2_ROOT = msys2 -c 'cygpath -m /'
+          $env:PATH = "$env:MSYS2_ROOT/ucrt64/bin;$env:PATH"
+          $env:DISTUTILS_TEST_DEFAULT_COMPILER = "mingw32"
+          tox
+
   ci_setuptools:
     # Integration testing with setuptools
     strategy:

.github/workflows/main.yml

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

.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

.readthedocs.yaml

@@ -14,7 +14,7 @@
 .. .. image:: https://readthedocs.org/projects/PROJECT_RTD/badge/?version=latest
 ..    :target: https://PROJECT_RTD.readthedocs.io/en/latest/?badge=latest
 
-.. image:: https://img.shields.io/badge/skeleton-2024-informational
+.. image:: https://img.shields.io/badge/skeleton-2025-informational
    :target: https://blog.jaraco.com/skeleton
 
 Python Module Distribution Utilities extracted from the Python Standard Library

README.rst

@@ -7,19 +7,6 @@
 import path
 import pytest
 
-collect_ignore = []
-
-
-if platform.system() != 'Windows':
-    collect_ignore.extend([
-        'distutils/msvc9compiler.py',
-    ])
-
-
-collect_ignore_glob = [
-    'distutils/_vendor/**/*',
-]
-
 
 @pytest.fixture
 def save_env():
@@ -61,7 +48,7 @@ def _save_cwd():
 
 @pytest.fixture
 def distutils_managed_tempdir(request):
-    from distutils.tests.compat import py38 as os_helper
+    from distutils.tests.compat import py39 as os_helper
 
     self = request.instance
     self.tempdirs = []
@@ -95,29 +82,6 @@ def temp_cwd(tmp_path):
         yield
 
 
-@pytest.fixture
-def pypirc(request, save_env, distutils_managed_tempdir):
-    from distutils.core import Distribution, PyPIRCCommand
-
-    self = request.instance
-    self.tmp_dir = self.mkdtemp()
-    os.environ['HOME'] = self.tmp_dir
-    os.environ['USERPROFILE'] = self.tmp_dir
-    self.rc = os.path.join(self.tmp_dir, '.pypirc')
-    self.dist = Distribution()
-
-    class command(PyPIRCCommand):
-        def __init__(self, dist):
-            super().__init__(dist)
-
-        def initialize_options(self):
-            pass
-
-        finalize_options = initialize_options
-
-    self._cmd = command
-
-
 # from pytest-dev/pytest#363
 @pytest.fixture(scope="session")
 def monkeysession(request):
@@ -128,7 +92,7 @@ def monkeysession(request):
     mpatch.undo()
 
 
-@pytest.fixture(autouse=True, scope="session")
+@pytest.fixture(scope="module")
 def suppress_path_mangle(monkeysession):
     """
     Disable the path mangling in CCompiler. Workaround for #169.
@@ -162,3 +126,22 @@ def disable_macos_customization(monkeypatch):
     from distutils import sysconfig
 
     monkeypatch.setattr(sysconfig, '_customize_macos', lambda: None)
+
+
+@pytest.fixture(autouse=True, scope="session")
+def monkey_patch_get_default_compiler(monkeysession):
+    """
+    Monkey patch distutils get_default_compiler to allow overriding the
+    default compiler. Mainly to test mingw32 with a MSVC Python.
+    """
+    from distutils import ccompiler
+
+    default_compiler = os.environ.get("DISTUTILS_TEST_DEFAULT_COMPILER")
+
+    if default_compiler is None:
+        return
+
+    def patched_getter(*args, **kwargs):
+        return default_compiler
+
+    monkeysession.setattr(ccompiler, 'get_default_compiler', patched_getter)