Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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: |
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion tests/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ envlist =
py312
py313
py314
py315

[testenv]
# We need newer Pip to operate under Python 3.14.
Expand Down Expand Up @@ -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
Expand Down