Merge pull request #55 from kurtmckee/release-1.1.1

Release 1.1.1

Author: kurtmckee

.github/FUNDING.yml renamed to .github/FUNDING.yaml

@@ -1,6 +1,6 @@
 # This file is a part of the detect-pythons project.
 # https://github.com/kurtmckee/detect-pythons
-# Copyright 2023 Kurt McKee <[email protected]>
+# Copyright 2023-2025 Kurt McKee <[email protected]>
 # SPDX-License-Identifier: MIT
 
 # This workflow exists for several purposes:
@@ -46,13 +46,13 @@ jobs:
       - uses: "actions/setup-python@v5"
         with:
           python-version: |
-            graalpy-23.1
-            pypy-3.10
-            3.12
+            graalpy-24
+            pypy-3.11
+            3.13
 
       - uses: "kurtmckee/detect-pythons@v1"
 
-      - uses: "actions/cache@v3"
+      - uses: "actions/cache@v4"
         id: "restore-cache"
         with:
           # You may need to augment the list of files to hash.
@@ -64,7 +64,8 @@ jobs:
 
       - name: "Identify .venv path"
         shell: "bash"
-        run: "echo 'venv-path=.venv/${{ runner.os == 'Windows' && 'Scripts' || 'bin' }}' >> $GITHUB_ENV"
+        run: |
+          echo 'venv-path=.venv/${{ runner.os == 'Windows' && 'Scripts' || 'bin' }}' >> "$GITHUB_ENV"
 
       - name: "Create a virtual environment"
         if: "steps.restore-cache.outputs.cache-hit == false"
@@ -95,7 +96,7 @@ jobs:
 
       - uses: "kurtmckee/detect-pythons@v1"
 
-      - uses: "actions/cache@v3"
+      - uses: "actions/cache@v4"
         id: "restore-cache"
         with:
           # You may need to augment the list of files to hash.
@@ -107,7 +108,8 @@ jobs:
 
       - name: "Identify .venv path"
         shell: "bash"
-        run: "echo 'venv-path=.venv/${{ runner.os == 'Windows' && 'Scripts' || 'bin' }}' >> $GITHUB_ENV"
+        run: |
+          echo 'venv-path=.venv/${{ runner.os == 'Windows' && 'Scripts' || 'bin' }}' >> "$GITHUB_ENV"
 
       - name: "Create a virtual environment"
         if: "steps.restore-cache.outputs.cache-hit == false"

.github/dependabot.yml renamed to .github/dependabot.yaml

@@ -1,4 +1,4 @@
-name: "🔬 Test"
+name: "🧪 Test"
 
 on:
   pull_request: null
@@ -8,70 +8,52 @@ on:
       - "releases"
 
 jobs:
-  tox:
-    name: "Tox (${{ matrix.os.name }})"
+  code:
+    name:
+      "Code (${{
+        (startswith(matrix.runner, 'ubuntu') && 'Linux')
+        || (startswith(matrix.runner, 'macos') && 'macOS')
+        || (startswith(matrix.runner, 'windows') && 'Windows')
+      }})"
 
     strategy:
-      matrix:
-        os:
-          - name: "Linux"
-            runner: "ubuntu-latest"
-          - name: "macOS"
-            runner: "macos-latest"
-          - name: "Windows"
-            runner: "windows-latest"
       fail-fast: false
+      matrix:
+        runner:
+          - "ubuntu-latest"
+          - "macos-latest"
+          - "windows-latest"
+
+        # Each operating system should test all Python interpreters simultaneously.
+        #
+        # Note: The CPython interpreter versions should be in ascending order
+        # because the last-listed version will be the default CPython version.
+        #
+        include:
+          - cpythons:
+              - "3.8"
+              - "3.9"
+              - "3.10"
+              - "3.11"
+              - "3.12"
+              - "3.13"
+            cpython-beta: "3.14"
+            pypys:
+              - "3.8"
+              - "3.9"
+              - "3.10"
+              - "3.11"
+
+    uses: "kurtmckee/github-workflows/.github/workflows/tox.yaml@ca26472ada33aa277527450aa46436f530e3d2c1" # v1.4
+    with:
+      config: "${{ toJSON(matrix) }}"
 
-    runs-on: "${{ matrix.os.runner }}"
-    steps:
-      - name: "Checkout the repository"
-        uses: "actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11" # v4.1.1
-
-      - name: "Setup Pythons"
-        uses: "actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c" # v5.0.0
-        with:
-          python-version: |
-            pypy3.8
-            pypy3.9
-            pypy3.10
-            3.8
-            3.9
-            3.10
-            3.11
-            3.12
-          allow-prereleases: true
-          cache: "pip"
-
-      - name: "Detect Pythons"
-        uses: "./"
-
-      - name: "Restore cache"
-        id: "restore-cache"
-        uses: "actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84" # v3.3.2
-        with:
-          path: |
-            .tox/
-            .venv
-          key: "tox-os=${{ matrix.os.runner }}-hash=${{ hashFiles('.python-identifiers', 'tox.ini') }}"
-
-      - name: "Identify .venv path"
-        shell: "bash"
-        run: "echo 'venv-path=.venv/${{ runner.os == 'Windows' && 'Scripts' || 'bin' }}' >> $GITHUB_ENV"
-
-      - name: "Create a virtual environment"
-        if: "steps.restore-cache.outputs.cache-hit == false"
-        run: |
-          python -m venv .venv
-          ${{ env.venv-path }}/python -m pip install --upgrade pip setuptools wheel
-          ${{ env.venv-path }}/pip install tox
-
-      - name: "Run the test suite"
-        run: "${{ env.venv-path }}/tox"
 
   inputs:
     name: "Inputs (${{ matrix.os.name }})"
 
     strategy:
+      fail-fast: false
       matrix:
         os:
           - name: "Linux"
@@ -80,12 +62,11 @@ jobs:
             runner: "macos-latest"
           - name: "Windows"
             runner: "windows-latest"
-      fail-fast: false
 
     runs-on: "${{ matrix.os.runner }}"
     steps:
       - name: "Checkout the repository"
-        uses: "actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11" # v4.1.1
+        uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4.2.2
 
       - name: "Test: Disable output file"
         uses: "./"

.github/workflows/readme_example.yaml

@@ -1,14 +1,17 @@
 ci:
   autoupdate_schedule: "monthly"
 
+default_language_version:
+  python: "python3.13"
+
 repos:
   - repo: "meta"
     hooks:
       - id: "check-hooks-apply"
       - id: "check-useless-excludes"
 
   - repo: "https://github.com/pre-commit/pre-commit-hooks"
-    rev: "v4.5.0"
+    rev: "v5.0.0"
     hooks:
       - id: "check-yaml"
       - id: "check-added-large-files"
@@ -23,34 +26,39 @@ repos:
     hooks:
       - id: "update-headers"
 
+  - repo: "https://github.com/sirosen/slyp"
+    rev: 0.8.2
+    hooks:
+      - id: "slyp"
+
   - repo: "https://github.com/psf/black-pre-commit-mirror"
-    rev: "23.12.0"
+    rev: "25.1.0"
     hooks:
       - id: "black"
 
   - repo: "https://github.com/pycqa/isort"
-    rev: "5.13.2"
+    rev: "6.0.1"
     hooks:
       - id: "isort"
 
   - repo: "https://github.com/pycqa/flake8"
-    rev: "6.1.0"
+    rev: "7.1.2"
     hooks:
       - id: "flake8"
         additional_dependencies:
-          - "flake8-bugbear==23.12.2"
+          - "flake8-bugbear==24.12.12"
 
-  - repo: "https://github.com/editorconfig-checker/editorconfig-checker.python"
-    rev: "2.7.3"
+  - repo: "https://github.com/editorconfig-checker/editorconfig-checker"
+    rev: "v3.2.0"
     hooks:
       - id: "editorconfig-checker"
-        # The README contain YAML samples indented with 2 spaces.
+        # The README contains YAML samples indented with 2 spaces.
         # The .editorconfig file requires 4 spaces for indentation,
         # so this pre-commit hook will ignore the README.
         exclude: "README.rst"
 
   - repo: "https://github.com/shellcheck-py/shellcheck-py"
-    rev: "v0.9.0.6"
+    rev: "v0.10.0.1"
     hooks:
       - id: "shellcheck"
         args:
@@ -66,7 +74,12 @@ repos:
         pass_filenames: false
 
   - repo: "https://github.com/python-jsonschema/check-jsonschema"
-    rev: "0.27.3"
+    rev: "0.31.2"
     hooks:
       - id: "check-github-workflows"
       - id: "check-dependabot"
+
+  - repo: "https://github.com/rhysd/actionlint"
+    rev: "v1.7.7"
+    hooks:
+      - id: "actionlint"

.github/workflows/test.yaml

@@ -1,7 +1,7 @@
 ..
     This file is a part of the detect-pythons project.
     https://github.com/kurtmckee/detect-pythons
-    Copyright 2023 Kurt McKee <[email protected]>
+    Copyright 2023-2025 Kurt McKee <[email protected]>
     SPDX-License-Identifier: MIT
 
 ..
@@ -24,6 +24,23 @@ Please see the fragment files in the `changelog.d directory`_.
 
 ..  scriv-insert-here
 
+.. _changelog-1.1.1:
+
+1.1.1 - 2025-03-06
+==================
+
+Python support
+--------------
+
+*   Support CPython 3.13 and PyPy 3.11.
+*   Test against early versions of Python 3.14.
+
+Development
+-----------
+
+*   Migrate to PEP 621 project metadata.
+*   Migrate to a reusable CI workflow.
+
 .. _changelog-1.1.0:
 
 1.1.0 - 2023-12-16

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright 2023 Kurt McKee <[email protected]>
+Copyright 2023-2025 Kurt McKee <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

CHANGELOG.rst

@@ -1,7 +1,7 @@
 ..
     This file is a part of the detect-pythons project.
     https://github.com/kurtmckee/detect-pythons
-    Copyright 2023 Kurt McKee <[email protected]>
+    Copyright 2023-2025 Kurt McKee <[email protected]>
     SPDX-License-Identifier: MIT
 
 Detect Python interpreters
@@ -52,13 +52,13 @@ and tox test environments stored in ``.tox/``.
     - uses: "actions/setup-python@v5"
       with:
         python-version: |
-          graalpy-23.1
-          pypy-3.10
-          3.12
+          graalpy-24
+          pypy-3.11
+          3.13
 
     - uses: "kurtmckee/detect-pythons@v1"
 
-    - uses: "actions/cache@v3"
+    - uses: "actions/cache@v4"
       id: "restore-cache"
       with:
         # You may need to augment the list of files to hash.
@@ -70,7 +70,8 @@ and tox test environments stored in ``.tox/``.
 
     - name: "Identify .venv path"
       shell: "bash"
-      run: "echo 'venv-path=.venv/${{ runner.os == 'Windows' && 'Scripts' || 'bin' }}' >> $GITHUB_ENV"
+      run: |
+        echo 'venv-path=.venv/${{ runner.os == 'Windows' && 'Scripts' || 'bin' }}' >> "$GITHUB_ENV"
 
     - name: "Create a virtual environment"
       if: "steps.restore-cache.outputs.cache-hit == false"
@@ -153,8 +154,8 @@ System CPython interpreters
 ---------------------------
 
 GitHub's Linux and macOS runners have system CPython interpreters installed.
-These are available at paths like ``/usr/bin/python``,
-which contains no useful information.
+These are available at paths which contain no useful information,
+like ``/usr/bin/python``.
 
 For these interpreters, the interpreter is executed
 and the value of ``sysconfig.get_config_var("EXT_SUFFIX")`` is extracted.
@@ -166,31 +167,11 @@ This results in a value like the following:
     "Linux", "``.cpython-310-x86_64-linux-gnu.so``"
     "macOS", "``.cpython-311-darwin.so``"
 
-
-macOS runner variability
-------------------------
-
-At the time of writing, GitHub's macOS runners sometimes have CPython 2.7 pre-installed.
-CPython 2.7 doesn't have an ``EXT_SUFFIX`` config value,
-so ``detect-pythons`` constructs one.
+Extremely old Python versions might not have an ``EXT_SUFFIX`` value.
+For example, CPython 2.7 doesn't have this value.
+If this is detected then an equivalent value is constructed.
 
 ..  csv-table::
     :header: "Platform", "Constructed ``EXT_SUFFIX`` equivalent"
 
-    "macOS 12.6", "``.cpython-27-darwin-x86_64``"
-
-Note that CPython 2.7 is only installed *sometimes*; sometimes it isn't.
-This is because ``macos-latest`` is sometimes macOS 12.6, and sometimes it's macOS 12.7.
-See `actions/runner-images#8642`_ for more information.
-
-When using ``detect-pythons`` to help with cache-busting,
-this variability means that you may see two caches appear in regular use
-for your macOS-based workflows;
-one that is valid when CPython 2.7 is pre-installed,
-and another that is valid when it *isn't* installed.
-
-
-..  Links
-..  -----
-..
-..  _actions/runner-images#8642: https://github.com/actions/runner-images/issues/8642
+    "macOS", "``.cpython-27-darwin-x86_64``"

LICENSE.txt

@@ -1,6 +1,6 @@
 # This file is a part of the detect-pythons project.
 # https://github.com/kurtmckee/detect-pythons
-# Copyright 2023 Kurt McKee <[email protected]>
+# Copyright 2023-2025 Kurt McKee <[email protected]>
 # SPDX-License-Identifier: MIT
 
 author: "Kurt McKee"