From 44549163357b2e80a6284374ba6019c3b15d4003 Mon Sep 17 00:00:00 2001 From: Angus Gibson Date: Mon, 1 Jul 2024 12:23:49 +1000 Subject: [PATCH 1/4] Add new Python versions to testing matrix --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index f406515e..9ec79bb0 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -23,7 +23,7 @@ jobs: shell: bash -el {0} strategy: matrix: - python-version: ["3.9", "3.10"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 From 6a6fcfb6073c0e681a116634cff66adc45742ddd Mon Sep 17 00:00:00 2001 From: Angus Gibson Date: Mon, 1 Jul 2024 14:26:05 +1000 Subject: [PATCH 2/4] Pin numpy in environment-ci.yml There are still a few incompatibilities with numpy 2.0.0, so we'll pin the previous version for the moment. In particular, xESMF regridders can't handle large grids with a number of points that overflows a 32-bit integer. --- environment-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment-ci.yml b/environment-ci.yml index 4bc4c43f..a16cf6f7 100644 --- a/environment-ci.yml +++ b/environment-ci.yml @@ -3,3 +3,4 @@ channels: - conda-forge dependencies: - esmpy + - numpy<2.0.0 From 3d4965f810e07a5f16cf51be8cebc1238470900d Mon Sep 17 00:00:00 2001 From: Angus Gibson Date: Mon, 1 Jul 2024 14:41:18 +1000 Subject: [PATCH 3/4] Pin numpy<2.0.0 in pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e427db43..dacad296 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ dependencies = [ "dask[array]", "dask[distributed]", "netCDF4", - "numpy >= 1.17.0", + "numpy >= 1.17.0, < 2.0.0", "scipy >= 1.2.0", "xarray", "xesmf >= 0.8.4", From e806ef03aa61b9d975a1b0af9ba1d6c1df83cfde Mon Sep 17 00:00:00 2001 From: Angus Gibson Date: Mon, 1 Jul 2024 16:09:13 +1000 Subject: [PATCH 4/4] Remove Python 3.11 from testing For some reason it seems to hang indefinitely. We'll just disable it for the moment (3.12 works, anyway). --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 9ec79bb0..b0a281c5 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -23,7 +23,7 @@ jobs: shell: bash -el {0} strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.12"] steps: - uses: actions/checkout@v3