Merge branch 'main' into cube-type-hints

SciTools · Jul 4, 2024 · 4185230 · 4185230
2 parents 1609216 + b857174
commit 4185230
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/lib/iris/tests/unit/fileformats/netcdf/saver/test_Saver__ugrid.py b/lib/iris/tests/unit/fileformats/netcdf/saver/test_Saver__ugrid.py
@@ -1199,7 +1199,7 @@ def test_multiple_equal_mesh(self):
 
     def test_multiple_different_meshes(self):
         # Create 2 meshes with different faces, but same edges.
-        # N.B. they should *not* then share an edge dimension !
+        # N.B. they should then share an edge dimension.
         mesh1 = make_mesh(n_faces=3, n_edges=2)
         mesh2 = make_mesh(n_faces=4, n_edges=2)
 

diff --git a/requirements/py310.yml b/requirements/py310.yml
@@ -18,7 +18,7 @@ dependencies:
   - libnetcdf !=4.9.1
   - matplotlib-base >=3.5
   - netcdf4
-  - numpy >=1.23, !=1.24.3
+  - numpy >=1.24, !=1.24.3, <2
   - python-xxhash
   - pyproj
   - scipy

diff --git a/requirements/py311.yml b/requirements/py311.yml
@@ -18,7 +18,7 @@ dependencies:
   - libnetcdf !=4.9.1
   - matplotlib-base >=3.5
   - netcdf4
-  - numpy >=1.23, !=1.24.3
+  - numpy >=1.24, !=1.24.3, <2
   - python-xxhash
   - pyproj
   - scipy

diff --git a/requirements/py312.yml b/requirements/py312.yml
@@ -18,7 +18,7 @@ dependencies:
   - libnetcdf !=4.9.1
   - matplotlib-base >=3.5
   - netcdf4
-  - numpy >=1.23, !=1.24.3
+  - numpy >=1.24, !=1.24.3, <2
   - python-xxhash
   - pyproj
   - scipy

diff --git a/requirements/pypi-core.txt b/requirements/pypi-core.txt
@@ -5,7 +5,7 @@ dask[array]>=2022.9.0
 # libnetcdf!=4.9.1 (not available on PyPI)
 matplotlib>=3.5
 netcdf4
-numpy>=1.23,!=1.24.3
+numpy>=1.24,!=1.24.3,<2
 pyproj
 scipy
 shapely!=1.8.3