From cf37a433e4360426d8c0a6d1e2a3b98c3ea4697f Mon Sep 17 00:00:00 2001 From: Paddy Roddy Date: Mon, 2 Oct 2023 15:40:23 +0100 Subject: [PATCH 01/10] Add `python==3.12` support --- .github/workflows/examples.yml | 4 ++-- .github/workflows/test.yml | 9 +++++++-- pyproject.toml | 4 +++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index ff8ac98fc..818c08fa0 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -16,7 +16,7 @@ jobs: - name: Set up python uses: actions/setup-python@v4 with: - python-version: "3.11" + python-version: "3.12" cache: "pip" cache-dependency-path: "pyproject.toml" @@ -41,7 +41,7 @@ jobs: - name: Set up python uses: actions/setup-python@v4 with: - python-version: "3.11" + python-version: "3.12" cache: "pip" cache-dependency-path: "pyproject.toml" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e6ba0e0a7..597a36f57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,8 +14,13 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, ubuntu-latest] - python-version: ["3.10", "3.11"] + os: + - macos-latest + - ubuntu-latest + python-version: + - "3.10" + - "3.11" + - "3.12" steps: - name: Checkout source uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 diff --git a/pyproject.toml b/pyproject.toml index f694086c2..511094439 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,6 +16,7 @@ classifiers = [ "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering :: Image Processing", "Topic :: Scientific/Engineering :: Mathematics", "Topic :: Scientific/Engineering :: Physics", @@ -199,6 +200,7 @@ legacy_tox_ini = """ python = 3.10: py310 3.11: py311 + 3.12: py312 [gh-actions:env] OS = @@ -212,5 +214,5 @@ legacy_tox_ini = """ pytest-cov [tox] - env_list = py{310,311}-{linux,macos} + env_list = py{310,311,312}-{linux,macos} """ From 7096cddbfa8ec2ef7ee472d29ea523365b9df6cb Mon Sep 17 00:00:00 2001 From: Paddy Roddy Date: Fri, 27 Oct 2023 21:37:24 +0100 Subject: [PATCH 02/10] Bump to `3.12` --- .github/workflows/deploy.yml | 2 +- .github/workflows/documentation.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a65a3442b..0c711931d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,5 +13,5 @@ jobs: with: pypi-api-token: ${{ secrets.PYPI_API_TOKEN }} pyproject-toml: ./pyproject.toml - python-version: "3.11" + python-version: "3.12" test-pypi-api-token: ${{ secrets.TEST_PYPI_API_TOKEN }} diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index c40aefb0c..9315ba27e 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -16,5 +16,5 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} project-directory: ./src/sleplet pyproject-toml: ./pyproject.toml - python-version: "3.11" + python-version: "3.12" template-directory: ./documentation From 466a300b38a4a203467083396add40471e45dc9e Mon Sep 17 00:00:00 2001 From: "Patrick J. Roddy" Date: Fri, 10 Nov 2023 15:01:27 +0000 Subject: [PATCH 03/10] Add `3.12` to `coveralls` --- .github/workflows/test.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 048017c46..6066742e8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,11 @@ jobs: uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # v2 with: parallel-finished: true - carryforward: "run-macos-latest-3.10,\ + carryforward: "\ + run-macos-latest-3.10,\ run-ubuntu-latest-3.10,\ run-macos-latest-3.11,\ - run-ubuntu-latest-3.11" + run-ubuntu-latest-3.11,\ + run-macos-latest-3.12,\ + run-ubuntu-latest-3.12\ + " From 9673c510c8374412ffe7a2c305af50bc48c61383 Mon Sep 17 00:00:00 2001 From: "Patrick J. Roddy" Date: Fri, 10 Nov 2023 15:26:16 +0000 Subject: [PATCH 04/10] Undo spacing change --- .github/workflows/test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6066742e8..5b804b599 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,11 +46,9 @@ jobs: uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # v2 with: parallel-finished: true - carryforward: "\ - run-macos-latest-3.10,\ + carryforward: "run-macos-latest-3.10,\ run-ubuntu-latest-3.10,\ run-macos-latest-3.11,\ run-ubuntu-latest-3.11,\ run-macos-latest-3.12,\ - run-ubuntu-latest-3.12\ - " + run-ubuntu-latest-3.12" From 534f656a917bf9978d91f3a8b2e22d509862f8e5 Mon Sep 17 00:00:00 2001 From: "Patrick J. Roddy" Date: Fri, 10 Nov 2023 16:29:06 +0000 Subject: [PATCH 05/10] Multiline --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5b804b599..6066742e8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,9 +46,11 @@ jobs: uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # v2 with: parallel-finished: true - carryforward: "run-macos-latest-3.10,\ + carryforward: "\ + run-macos-latest-3.10,\ run-ubuntu-latest-3.10,\ run-macos-latest-3.11,\ run-ubuntu-latest-3.11,\ run-macos-latest-3.12,\ - run-ubuntu-latest-3.12" + run-ubuntu-latest-3.12\ + " From 1a315e30821f0a2000430e7d585df870e71c2b62 Mon Sep 17 00:00:00 2001 From: "Patrick J. Roddy" Date: Wed, 24 Jan 2024 11:58:09 +0000 Subject: [PATCH 06/10] Update test.yml --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a751444a2..3951b2bbd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,5 +57,4 @@ jobs: run-macos-latest-3.11,\ run-ubuntu-latest-3.11,\ run-macos-latest-3.12,\ - run-ubuntu-latest-3.12\ - " + run-ubuntu-latest-3.12" From ffbb0884b8f4f641d23fc328b3ed542feb1ba767 Mon Sep 17 00:00:00 2001 From: "Patrick J. Roddy" Date: Wed, 24 Jan 2024 11:59:49 +0000 Subject: [PATCH 07/10] Try `numba` release candidate --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7461d3ee1..e790adc6d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ dependencies = [ "libigl~=2.0", "matplotlib~=3.0", "multiprocess~=0.0", - "numba~=0.0", + "numba==0.60.0dev0", "numpy~=1.0", "platformdirs~=4.0", "plotly~=5.0", From 4abf26206362e2a96b1dbf0603921745701e2d92 Mon Sep 17 00:00:00 2001 From: "Patrick J. Roddy" Date: Wed, 24 Jan 2024 12:01:55 +0000 Subject: [PATCH 08/10] Revert "Try `numba` release candidate" This reverts commit ffbb0884b8f4f641d23fc328b3ed542feb1ba767. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e790adc6d..7461d3ee1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ dependencies = [ "libigl~=2.0", "matplotlib~=3.0", "multiprocess~=0.0", - "numba==0.60.0dev0", + "numba~=0.0", "numpy~=1.0", "platformdirs~=4.0", "plotly~=5.0", From fe261354db6cc02f01ef220dc96adbac04428f56 Mon Sep 17 00:00:00 2001 From: "Patrick J. Roddy" Date: Thu, 13 Jun 2024 09:51:45 +0100 Subject: [PATCH 09/10] Try release candidate `gmpy2` --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 78a008d00..da3a40208 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ ] dependencies = [ "cmocean~=4.0", - "gmpy2~=2.0", + "gmpy2==2.2.0rc1", "hypothesis~=6.0", "libigl~=2.0", "matplotlib~=3.0", From 69cacb2759d9f353707857319598a3bb69d911e5 Mon Sep 17 00:00:00 2001 From: "Patrick J. Roddy" Date: Mon, 1 Jul 2024 07:16:39 +0100 Subject: [PATCH 10/10] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index da3a40208..78a008d00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ ] dependencies = [ "cmocean~=4.0", - "gmpy2==2.2.0rc1", + "gmpy2~=2.0", "hypothesis~=6.0", "libigl~=2.0", "matplotlib~=3.0",