From bedf2f285561aecd2973f21df1e44b099e0ee7c6 Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Sat, 27 Jul 2024 05:43:59 -0400 Subject: [PATCH 1/4] Add explicit support for Python 3.13 --- .github/workflows/test_latest_versions.yml | 2 +- pyproject.toml | 1 + tox.ini | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_latest_versions.yml b/.github/workflows/test_latest_versions.yml index 03e07987..ab0fe360 100644 --- a/.github/workflows/test_latest_versions.yml +++ b/.github/workflows/test_latest_versions.yml @@ -20,7 +20,7 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-latest] - python-version: ["3.8", "3.12"] + python-version: ["3.8", "3.13"] include: - os: macos-latest python-version: "3.12" diff --git a/pyproject.toml b/pyproject.toml index fd884279..64efeec5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Scientific/Engineering :: Physics", ] diff --git a/tox.ini b/tox.ini index 4ca775f0..5ae17d3a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.25 -envlist = py{38,39,310,311,312}{,-notebook}, lint, coverage, docs +envlist = py{38,39,310,311,312,313}{,-notebook}, lint, coverage, docs isolated_build = True [testenv] @@ -32,7 +32,7 @@ commands = pylint -rn circuit_knitting/ test/ tools/ nbqa pylint -rn docs/ -[testenv:{,py-,py3-,py38-,py39-,py310-,py311-,py312-}notebook] +[testenv:{,py-,py3-,py38-,py39-,py310-,py311-,py312-,py313-}notebook] extras = nbtest notebook-dependencies From 91d105892f925a61a4191c5cb78ac7768a438d0a Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Sat, 27 Jul 2024 05:50:56 -0400 Subject: [PATCH 2/4] Ask setup-python to install a dev version of Python 3.13 https://github.com/actions/setup-python/blob/main/docs/advanced-usage.md#using-the-python-version-input --- .github/workflows/test_latest_versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_latest_versions.yml b/.github/workflows/test_latest_versions.yml index ab0fe360..3b67dbb4 100644 --- a/.github/workflows/test_latest_versions.yml +++ b/.github/workflows/test_latest_versions.yml @@ -20,7 +20,7 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-latest] - python-version: ["3.8", "3.13"] + python-version: ["3.8", "3.13-dev"] include: - os: macos-latest python-version: "3.12" From 7737dec7288176fdddcc1bf7247ee01231bc0d88 Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Sat, 27 Jul 2024 06:12:51 -0400 Subject: [PATCH 3/4] Fix CI scripts to work with prerelease versions of Python --- .github/workflows/test_development_versions.yml | 6 +++--- .github/workflows/test_latest_versions.yml | 6 +++--- .github/workflows/test_minimum_versions.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test_development_versions.yml b/.github/workflows/test_development_versions.yml index 4d0c5892..4b1e0d91 100644 --- a/.github/workflows/test_development_versions.yml +++ b/.github/workflows/test_development_versions.yml @@ -43,6 +43,6 @@ jobs: - name: Test using tox environment shell: bash run: | - pver=${{ matrix.python-version }} - tox -epy${pver/./} -- --run-slow - tox -epy${pver/./}-notebook + pver=$(echo ${{ matrix.python-version }} | sed -E 's/^([0-9]+)\.([0-9]+).*$/\1\2/') + tox -epy${pver} -- --run-slow + tox -epy${pver}-notebook diff --git a/.github/workflows/test_latest_versions.yml b/.github/workflows/test_latest_versions.yml index 3b67dbb4..2d77a7e3 100644 --- a/.github/workflows/test_latest_versions.yml +++ b/.github/workflows/test_latest_versions.yml @@ -44,6 +44,6 @@ jobs: - name: Test using tox environment shell: bash run: | - pver=${{ matrix.python-version }} - tox -epy${pver/./} -- --run-slow - tox -epy${pver/./}-notebook + pver=$(echo ${{ matrix.python-version }} | sed -E 's/^([0-9]+)\.([0-9]+).*$/\1\2/') + tox -epy${pver} -- --run-slow + tox -epy${pver}-notebook diff --git a/.github/workflows/test_minimum_versions.yml b/.github/workflows/test_minimum_versions.yml index f337a42f..65598036 100644 --- a/.github/workflows/test_minimum_versions.yml +++ b/.github/workflows/test_minimum_versions.yml @@ -39,6 +39,6 @@ jobs: - name: Test using tox environment shell: bash run: | - pver=${{ matrix.python-version }} - tox -epy${pver/./} -- --run-slow - tox -epy${pver/./}-notebook + pver=$(echo ${{ matrix.python-version }} | sed -E 's/^([0-9]+)\.([0-9]+).*$/\1\2/') + tox -epy${pver} -- --run-slow + tox -epy${pver}-notebook From e7222485088fe531179e0b8cf03b6831ca133dbb Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Mon, 29 Jul 2024 16:45:32 -0400 Subject: [PATCH 4/4] Longer variable name --- .github/workflows/test_development_versions.yml | 6 +++--- .github/workflows/test_latest_versions.yml | 6 +++--- .github/workflows/test_minimum_versions.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test_development_versions.yml b/.github/workflows/test_development_versions.yml index 4b1e0d91..cac3d71f 100644 --- a/.github/workflows/test_development_versions.yml +++ b/.github/workflows/test_development_versions.yml @@ -43,6 +43,6 @@ jobs: - name: Test using tox environment shell: bash run: | - pver=$(echo ${{ matrix.python-version }} | sed -E 's/^([0-9]+)\.([0-9]+).*$/\1\2/') - tox -epy${pver} -- --run-slow - tox -epy${pver}-notebook + toxpyversion=$(echo ${{ matrix.python-version }} | sed -E 's/^([0-9]+)\.([0-9]+).*$/\1\2/') + tox -epy${toxpyversion} -- --run-slow + tox -epy${toxpyversion}-notebook diff --git a/.github/workflows/test_latest_versions.yml b/.github/workflows/test_latest_versions.yml index 2d77a7e3..94cf7da6 100644 --- a/.github/workflows/test_latest_versions.yml +++ b/.github/workflows/test_latest_versions.yml @@ -44,6 +44,6 @@ jobs: - name: Test using tox environment shell: bash run: | - pver=$(echo ${{ matrix.python-version }} | sed -E 's/^([0-9]+)\.([0-9]+).*$/\1\2/') - tox -epy${pver} -- --run-slow - tox -epy${pver}-notebook + toxpyversion=$(echo ${{ matrix.python-version }} | sed -E 's/^([0-9]+)\.([0-9]+).*$/\1\2/') + tox -epy${toxpyversion} -- --run-slow + tox -epy${toxpyversion}-notebook diff --git a/.github/workflows/test_minimum_versions.yml b/.github/workflows/test_minimum_versions.yml index 65598036..bf454c7c 100644 --- a/.github/workflows/test_minimum_versions.yml +++ b/.github/workflows/test_minimum_versions.yml @@ -39,6 +39,6 @@ jobs: - name: Test using tox environment shell: bash run: | - pver=$(echo ${{ matrix.python-version }} | sed -E 's/^([0-9]+)\.([0-9]+).*$/\1\2/') - tox -epy${pver} -- --run-slow - tox -epy${pver}-notebook + toxpyversion=$(echo ${{ matrix.python-version }} | sed -E 's/^([0-9]+)\.([0-9]+).*$/\1\2/') + tox -epy${toxpyversion} -- --run-slow + tox -epy${toxpyversion}-notebook