From afe6d53f84d6be746fee121660e487224324ddf4 Mon Sep 17 00:00:00 2001
From: John Sirois <john.sirois@gmail.com>
Date: Thu, 16 Oct 2025 11:30:06 -0700
Subject: [PATCH] Support Python 3.15.

---
 .github/workflows/ci.yml      | 26 ++++++++++++++------------
 .github/workflows/release.yml |  4 ++--
 setup.cfg                     |  3 ++-
 tests/test_main.py            |  2 +-
 tox.ini                       |  2 ++
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27cc1df..305f7f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,9 +33,9 @@ jobs:
             tox-env: check
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "${{ matrix.python-version }}"
       - name: Check ${{ matrix.check-name }}
@@ -60,10 +60,10 @@ jobs:
           - python-version: [3, 8, 18]
             os: ubuntu-24.04
           - python-version: [2, 7, 18]
-            os: macos-13
+            os: macos-15
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install Python Build Deps
         if: matrix.os == 'ubuntu-24.04'
         run: |
@@ -125,20 +125,22 @@ jobs:
           - os: ubuntu-24.04
             python-version: [3, 13]
           - os: ubuntu-24.04
-            python-version: [3, 14, "0-alpha.1"]
-          - os: macos-13
-            python-version: [3, 13]
-          - os: macos-13
-            python-version: [3, 14, "0-alpha.1"]
+            python-version: [3, 14]
+          - os: ubuntu-24.04
+            python-version: [3, 15, "0-alpha.1"]
+          - os: macos-15
+            python-version: [3, 14]
+          - os: macos-15
+            python-version: [3, 15, "0-alpha.1"]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup Python ${{ join(matrix.python-version, '.') }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "${{ join(matrix.python-version, '.') }}"
       - name: Setup Tox Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.11
       - name: Run Unit Tests
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dce3c76..dc32192 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,11 +47,11 @@ jobs:
       id-token: write
     steps:
       - name: Checkout ${{ needs.determine-tag.outputs.release-tag }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ needs.determine-tag.outputs.release-tag }}
       - name: Setup Python 3.9
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Package ${{ needs.determine-tag.outputs.release-tag }}
diff --git a/setup.cfg b/setup.cfg
index 7731a60..8ad3728 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,13 +30,14 @@ classifiers =
     Programming Language :: Python :: 3.12
     Programming Language :: Python :: 3.13
     Programming Language :: Python :: 3.14
+    Programming Language :: Python :: 3.15
     Topic :: Utilities
 
 [options]
 packages =
     conscript
 
-python_requires = >=2.7,<3.15,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
+python_requires = >=2.7,<3.16,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
 
 install_requires =
     setuptools; python_version <= '3.5'
diff --git a/tests/test_main.py b/tests/test_main.py
index 05e170c..e717473 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -122,7 +122,7 @@ def test_conscript(foo_bar_conscript):
             programs=", ".join(
                 (
                     repr(program)
-                    if sys.version_info[:2] < (3, 14)
+                    if sys.version_info[:2] < (3, 12)
                     # N.B.: Python 3.14 dropped wrapping the choices in ''.
                     else program
                 )
diff --git a/tox.ini b/tox.ini
index 4263a28..084a147 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,6 +22,7 @@ envlist =
     py312
     py313
     py314
+    py315
 
 [testenv]
 # We need newer Pip to operate under Python 3.14.
@@ -93,6 +94,7 @@ commands =
     mypy --python-version 3.12 conscript
     mypy --python-version 3.13 conscript
     mypy --python-version 3.14 conscript
+    mypy --python-version 3.15 conscript
 
 [testenv:package]
 skip_install = true