Merge branch 'main' into make_setup_rundir_more_robust

COSIMA · Jul 1, 2024 · 0770836 · 0770836
2 parents 65bf6f7 + 578590f
commit 0770836
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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

diff --git a/environment-ci.yml b/environment-ci.yml
@@ -3,3 +3,4 @@ channels:
   - conda-forge
 dependencies:
   - esmpy
+  - numpy<2.0.0
diff --git 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",