From 79f6c812caa807929ecd191a3b9b379727367a2b Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 17 Oct 2023 16:54:51 +0100 Subject: [PATCH 01/12] add python 3.12 to supported test versions --- .github/workflows/run-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 466a8d4b..c300b107 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -5,6 +5,7 @@ on: push: branches: - main + - python312 schedule: - cron: '0 0 * * *' # nightly @@ -13,7 +14,7 @@ jobs: runs-on: "ubuntu-latest" strategy: matrix: - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11", "3.12"] fail-fast: false name: Linux Python ${{ matrix.python-version }} steps: From 5698f407bb940e109dbdaca703f1c89a6e14403c Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 17 Oct 2023 16:55:54 +0100 Subject: [PATCH 02/12] setup-python to v4 --- .github/workflows/build-and-deploy-on-pypi.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-deploy-on-pypi.yml b/.github/workflows/build-and-deploy-on-pypi.yml index a6f6a6e6..d3c391df 100644 --- a/.github/workflows/build-and-deploy-on-pypi.yml +++ b/.github/workflows/build-and-deploy-on-pypi.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: Set up Python 3.11 - uses: actions/setup-python@v1 + - name: Set up Python 3.12 + uses: actions/setup-python@v4 with: - python-version: "3.11" + python-version: "3.12" - name: Install pep517 run: >- python -m From c23e29ef4780393c243637dc389f1d6af08bcd5f Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 17 Oct 2023 16:56:18 +0100 Subject: [PATCH 03/12] run GA --- .github/workflows/build-and-deploy-on-pypi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-deploy-on-pypi.yml b/.github/workflows/build-and-deploy-on-pypi.yml index d3c391df..9fc2dfbf 100644 --- a/.github/workflows/build-and-deploy-on-pypi.yml +++ b/.github/workflows/build-and-deploy-on-pypi.yml @@ -7,6 +7,7 @@ on: push: branches: - main + - python312 jobs: build-n-publish: From 83afdd679fbff6be8475841fa1e9f8826aa8e576 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 17 Oct 2023 17:06:26 +0100 Subject: [PATCH 04/12] unpin and comment out for testing only --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index fd42d47c..4adf0d43 100644 --- a/environment.yml +++ b/environment.yml @@ -5,12 +5,12 @@ channels: - nodefaults dependencies: - - basemap >=1.3.6 + # - basemap >=1.3.6 # testing for python=3.12 - cartopy - matplotlib - nctoolkit >=0.8.7 # use linux64 build - netcdf4 - - numpy >1.24.3, <1.25 # basemap=1.3.7 needs <1.25 + - numpy >1.24.3 # , <1.25 # basemap=1.3.7 needs <1.25 ## testing for python 3.12 - pip !=21.3 - python >=3.9 - pyyaml From f561ecfe7bcf9616b261fe1cadb7077ccfa5f7f7 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 17 Oct 2023 17:14:03 +0100 Subject: [PATCH 05/12] comment out nctoolkit too --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 4adf0d43..d81d5ce3 100644 --- a/environment.yml +++ b/environment.yml @@ -8,7 +8,7 @@ dependencies: # - basemap >=1.3.6 # testing for python=3.12 - cartopy - matplotlib - - nctoolkit >=0.8.7 # use linux64 build + # - nctoolkit >=0.8.7 # use linux64 build # testing for python=3.12 - netcdf4 - numpy >1.24.3 # , <1.25 # basemap=1.3.7 needs <1.25 ## testing for python 3.12 - pip !=21.3 From 443dfdb8010bc5347ee803f7cffa87885c7973be Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 4 Dec 2023 14:36:53 +0000 Subject: [PATCH 06/12] just leave basemap out --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index d81d5ce3..1a03e728 100644 --- a/environment.yml +++ b/environment.yml @@ -8,9 +8,9 @@ dependencies: # - basemap >=1.3.6 # testing for python=3.12 - cartopy - matplotlib - # - nctoolkit >=0.8.7 # use linux64 build # testing for python=3.12 + - nctoolkit >=0.8.7 # use linux64 build - netcdf4 - - numpy >1.24.3 # , <1.25 # basemap=1.3.7 needs <1.25 ## testing for python 3.12 + - numpy >1.24.3 - pip !=21.3 - python >=3.9 - pyyaml From 69727ae6673a1849dedb834bf5017fafa57b20b7 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 4 Dec 2023 14:37:06 +0000 Subject: [PATCH 07/12] remove upper pin on numpy --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3baa25f6..c3a76c4f 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ 'matplotlib', 'nctoolkit>=0.8.7', # use linux64 build 'netcdf4', - 'numpy>1.24.3,<1.25', # basemap 1.3.7 needs <1.25 + 'numpy>1.24.3', 'pip!=21.3', 'pyyaml', 'scikit-learn', From a6637a1891f3458aea2daac10b3b68f9f52ec6e8 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 12 Jan 2024 15:18:20 +0000 Subject: [PATCH 08/12] reinstate basemap --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 1a03e728..3a45b5a3 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,7 @@ channels: - nodefaults dependencies: - # - basemap >=1.3.6 # testing for python=3.12 + - basemap >=1.3.6 - cartopy - matplotlib - nctoolkit >=0.8.7 # use linux64 build From a2d20a546e13daf884690a44ea1daa3577020364 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 21 Mar 2024 15:27:24 +0000 Subject: [PATCH 09/12] run push tests with py312 --- .github/workflows/run-tests-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests-push.yml b/.github/workflows/run-tests-push.yml index 77495f27..7c1e5b8a 100644 --- a/.github/workflows/run-tests-push.yml +++ b/.github/workflows/run-tests-push.yml @@ -8,7 +8,7 @@ jobs: runs-on: "ubuntu-latest" strategy: matrix: - python-version: ["3.11"] + python-version: ["3.12"] fail-fast: false name: Linux Python ${{ matrix.python-version }} steps: From a319370bbb33acd5c188efb8c4c413d5344cf8db Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 21 Mar 2024 15:35:04 +0000 Subject: [PATCH 10/12] unrun GA on branch --- .github/workflows/build-and-deploy-on-pypi.yml | 1 - .github/workflows/run-tests.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/build-and-deploy-on-pypi.yml b/.github/workflows/build-and-deploy-on-pypi.yml index 9fc2dfbf..d3c391df 100644 --- a/.github/workflows/build-and-deploy-on-pypi.yml +++ b/.github/workflows/build-and-deploy-on-pypi.yml @@ -7,7 +7,6 @@ on: push: branches: - main - - python312 jobs: build-n-publish: diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 18f28093..729588a7 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -5,7 +5,6 @@ on: push: branches: - main - - python312 schedule: - cron: '0 0 * * *' # nightly From 1e141bb086c59e5bddeeee2a15a523ffa378eeb5 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 21 Mar 2024 15:35:41 +0000 Subject: [PATCH 11/12] add supported Python to readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ffbcbcd..2c6167cf 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This work was funded through WP1 of the Terrafirma project. Current version notes: -- Suported versions of Python: 3.9, 3.10 and 3.11 +- Suported versions of Python: 3.9, 3.10, 3.11, and 3.12 Environment and installation ============================ From 79971aa8ddb89e7c59f9f5ca9dd65147cf685adf Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Thu, 21 Mar 2024 15:36:37 +0000 Subject: [PATCH 12/12] add supported python to setup --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index c3a76c4f..134b294f 100755 --- a/setup.py +++ b/setup.py @@ -176,6 +176,7 @@ def read_authors(filename): 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Topic :: Scientific/Engineering', 'Topic :: Scientific/Engineering :: Atmospheric Science', 'Topic :: Scientific/Engineering :: GIS',