From 92e4e7781ae3ebe6c642d46b97b6576d7e056811 Mon Sep 17 00:00:00 2001 From: James Clark Date: Wed, 17 Dec 2025 10:35:18 +0000 Subject: [PATCH 1/4] Change release flag --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 171526c..9f0e686 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ MAJOR = 0 MINOR = 8 PATCH = 0 -ISRELEASED = True +ISRELEASED = False VERSION = '{}.{}.{}'.format(MAJOR, MINOR, PATCH) build_type = 'prod' From d4fbd3d7db02b0e75b343880e23bad22649ed510 Mon Sep 17 00:00:00 2001 From: James Clark Date: Wed, 17 Dec 2025 10:37:25 +0000 Subject: [PATCH 2/4] Update Python and NumPy version restrictions --- .readthedocs_environment.yml | 2 +- conda/conda_build_config.yaml | 1 + conda/meta.yaml | 8 ++++---- environment.yml | 4 ++-- pyproject.toml | 6 +++--- requirements.txt | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.readthedocs_environment.yml b/.readthedocs_environment.yml index 5414ff5..549b8a7 100644 --- a/.readthedocs_environment.yml +++ b/.readthedocs_environment.yml @@ -4,7 +4,7 @@ channels: - conda-forge - JimClark dependencies: - - python=3.11 + - python=3.12 - pylag - matplotlib - cartopy diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml index f18183e..b90ff15 100644 --- a/conda/conda_build_config.yaml +++ b/conda/conda_build_config.yaml @@ -1,6 +1,7 @@ python: - 3.11 - 3.12 + - 3.13 numpy: - 2.3 diff --git a/conda/meta.yaml b/conda/meta.yaml index dd9a6f5..499f921 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -18,17 +18,17 @@ requirements: - pip - openmpi - mpi4py - - numpy>=1.20 - - cython>=0.29 + - numpy>=2.0 + - cython>=3.0 build: - python - {{ compiler('cxx') }} run: - python - mpi4py - - numpy>=1.20 + - numpy>=2.0 - scipy>=1.4.1 - - cython>=0.29 + - cython>=3.0 - progressbar - natsort - netCDF4 diff --git a/environment.yml b/environment.yml index 4a6789d..be4ef70 100644 --- a/environment.yml +++ b/environment.yml @@ -4,9 +4,9 @@ channels: dependencies: - python - mpi4py - - numpy>=1.20 + - numpy>=2.0 - scipy>=1.4.1 - - cython>=0.29 + - cython>=3.0 - progressbar - natsort - netCDF4 diff --git a/pyproject.toml b/pyproject.toml index d02131d..26834ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,8 +14,8 @@ dynamic = ["version"] readme = "README.md" requires-python = ">=3.8" dependencies = [ - "cython>=0.29", - "numpy>=1.20", + "cython>=3.0", + "numpy>=2.0", "scipy>=1.4.1", "netCDF4", "cftime>=1.1", @@ -35,11 +35,11 @@ classifiers = [ 'Programming Language :: C++', 'Programming Language :: Cython', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Operating System :: UNIX', ] diff --git a/requirements.txt b/requirements.txt index 6243deb..e6195e3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,9 +2,9 @@ # For running PyLag mpi4py -numpy>=1.18 +numpy>=2.0 scipy>=1.4.1 -cython>=0.29 +cython>=3.0 progressbar natsort netCDF4 From 19386b497fb7df7a1961998c0b0f07be6bf4ba18 Mon Sep 17 00:00:00 2001 From: James Clark Date: Wed, 17 Dec 2025 11:42:52 +0000 Subject: [PATCH 3/4] Add automatic retrieval of version for Conda build --- conda/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/meta.yaml b/conda/meta.yaml index 499f921..214ca98 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,5 +1,6 @@ {% set name = "PyLag" %} {% set version = "0.8.0" %} +{% set version = load_setup_py_data().get('version') %} package: name: "{{ name|lower }}" From 1bbfd466aba4d9c7cd54fa70ac9f8caba236227b Mon Sep 17 00:00:00 2001 From: James Clark Date: Wed, 17 Dec 2025 11:44:33 +0000 Subject: [PATCH 4/4] Update tested python version in GitHub actions --- .github/workflows/pylag-package-conda-linux-release.yml | 2 +- .github/workflows/pylag-package-conda-linux.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pylag-package-conda-linux-release.yml b/.github/workflows/pylag-package-conda-linux-release.yml index c9206bc..79e704d 100644 --- a/.github/workflows/pylag-package-conda-linux-release.yml +++ b/.github/workflows/pylag-package-conda-linux-release.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: ["ubuntu-latest"] - python-version: ["3.11"] + python-version: ["3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v2 - uses: conda-incubator/setup-miniconda@v2 diff --git a/.github/workflows/pylag-package-conda-linux.yml b/.github/workflows/pylag-package-conda-linux.yml index 9e8a4ed..90be36d 100644 --- a/.github/workflows/pylag-package-conda-linux.yml +++ b/.github/workflows/pylag-package-conda-linux.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: ["ubuntu-latest"] - python-version: ["3.11", "3.12"] + python-version: ["3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v2 - uses: conda-incubator/setup-miniconda@v2