Lockfile updates (SciTools#4968)

* Updated environment lockfiles * Adjustments for Cartopy v0.21.0 (SciTools/cartopy@fcb784d). * Cartopy >=0.21 pin. * What's New entry. * WIP try netCDF4 pin. * Try pip installing netcdf4==1.6.1 as requested by @ocefpaf. * Revert "Try pip installing netcdf4==1.6.1 as requested by @ocefpaf." This reverts commit ce9f890. * netcdf4!=1.6.1 * Align Conda YAML formatting. Co-authored-by: Lockfile bot <[email protected]>
trexfeathers · Sep 26, 2022 · b179485 · b179485
1 parent d38c504
commit b179485
Show file tree

Hide file tree

Showing 9 changed files with 171 additions and 166 deletions.
diff --git a/lib/iris/analysis/cartography.py b/lib/iris/analysis/cartography.py
@@ -1008,8 +1008,8 @@ def _transform_distance_vectors_tolerance_mask(
     u_one_t, v_zero_t = _transform_distance_vectors(ones, zeros, ds, dx2, dy2)
     u_zero_t, v_one_t = _transform_distance_vectors(zeros, ones, ds, dx2, dy2)
     # Squared magnitudes should be equal to one within acceptable tolerance.
-    # A value of atol=2e-3 is used, which corresponds to a change in magnitude
-    # of approximately 0.1%.
+    # A value of atol=2e-3 is used, which masks any magnitude changes >0.5%
+    #  (approx percentage - based on experimenting).
     sqmag_1_0 = u_one_t**2 + v_zero_t**2
     sqmag_0_1 = u_zero_t**2 + v_one_t**2
     mask = np.logical_not(

diff --git a/lib/iris/tests/unit/analysis/cartography/test_rotate_winds.py b/lib/iris/tests/unit/analysis/cartography/test_rotate_winds.py
@@ -16,6 +16,7 @@
 import cartopy.crs as ccrs
 import numpy as np
 import numpy.ma as ma
+import pytest
 
 from iris.analysis.cartography import rotate_winds, unrotate_pole
 import iris.coord_systems
@@ -410,7 +411,11 @@ def test_transposed(self):
 class TestMasking(tests.IrisTest):
     def test_rotated_to_osgb(self):
         # Rotated Pole data with large extent.
-        x = np.linspace(311.9, 391.1, 10)
+        # A 'correct' answer is not known for this test; it is therefore
+        #  written as a 'benchmark' style test - a change in behaviour will
+        #  cause a test failure, requiring developers to approve/reject the
+        #  new behaviour.
+        x = np.linspace(221.9, 301.1, 10)
         y = np.linspace(-23.6, 24.8, 8)
         u, v = uv_cubes(x, y)
         ut, vt = rotate_winds(u, v, iris.coord_systems.OSGB())
@@ -422,14 +427,14 @@ def test_rotated_to_osgb(self):
         # Snapshot of mask with fixed tolerance of atol=2e-3
         expected_mask = np.array(
             [
-                [1, 1, 1, 0, 0, 0, 0, 0, 0, 1],
-                [1, 1, 1, 0, 0, 0, 0, 0, 0, 1],
-                [1, 1, 1, 1, 0, 0, 0, 0, 1, 1],
-                [1, 1, 1, 1, 0, 0, 0, 0, 1, 1],
-                [1, 1, 1, 1, 0, 0, 0, 0, 1, 1],
-                [1, 1, 1, 1, 1, 0, 0, 1, 1, 1],
-                [1, 1, 1, 1, 1, 0, 0, 1, 1, 1],
-                [1, 1, 1, 1, 1, 0, 0, 1, 1, 1],
+                [0, 0, 0, 1, 1, 1, 0, 0, 0, 1],
+                [0, 0, 0, 0, 1, 1, 1, 0, 1, 1],
+                [0, 0, 0, 0, 0, 1, 1, 1, 1, 1],
+                [0, 0, 0, 0, 1, 1, 1, 0, 0, 0],
+                [0, 0, 0, 1, 1, 1, 1, 1, 0, 0],
+                [0, 1, 1, 1, 1, 1, 1, 0, 0, 0],
+                [0, 1, 1, 1, 0, 1, 1, 1, 0, 0],
+                [0, 1, 0, 0, 0, 0, 1, 1, 1, 0],
             ],
             np.bool_,
         )
@@ -443,7 +448,7 @@ def test_rotated_to_osgb(self):
         # Calculate percentage error (note there are no zero magnitudes
         # so we can divide safely).
         anom = 100.0 * np.abs(res_mag - expected_mag) / expected_mag
-        self.assertTrue(anom[~ut.data.mask].max() < 0.1)
+        assert anom[~ut.data.mask].max() == pytest.approx(0.3227935)
 
     def test_rotated_to_unrotated(self):
         # Suffiently accurate so that no mask is introduced.

diff --git a/requirements/ci/nox.lock/py310-linux-64.lock b/requirements/ci/nox.lock/py310-linux-64.lock
diff --git a/requirements/ci/nox.lock/py38-linux-64.lock b/requirements/ci/nox.lock/py38-linux-64.lock
diff --git a/requirements/ci/nox.lock/py39-linux-64.lock b/requirements/ci/nox.lock/py39-linux-64.lock
diff --git a/requirements/ci/py310.yml b/requirements/ci/py310.yml
@@ -11,12 +11,12 @@ dependencies:
   - setuptools-scm >=7
 
 # Core dependencies.
-  - cartopy >=0.20
+  - cartopy >=0.21
   - cf-units >=3.1
   - cftime >=1.5
   - dask-core >=2
   - matplotlib
-  - netcdf4
+  - netcdf4 !=1.6.1
   - numpy >=1.19
   - python-xxhash
   - pyproj

diff --git a/requirements/ci/py38.yml b/requirements/ci/py38.yml
@@ -11,12 +11,12 @@ dependencies:
   - setuptools-scm >=7
 
 # Core dependencies.
-  - cartopy >=0.20
+  - cartopy >=0.21
   - cf-units >=3.1
   - cftime >=1.5
   - dask-core >=2
   - matplotlib
-  - netcdf4
+  - netcdf4 !=1.6.1
   - numpy >=1.19
   - python-xxhash
   - pyproj

diff --git a/requirements/ci/py39.yml b/requirements/ci/py39.yml
@@ -11,12 +11,12 @@ dependencies:
   - setuptools-scm >=7
 
 # Core dependencies.
-  - cartopy >=0.20
+  - cartopy >=0.21
   - cf-units >=3.1
   - cftime >=1.5
   - dask-core >=2
   - matplotlib
-  - netcdf4
+  - netcdf4 !=1.6.1
   - numpy >=1.19
   - python-xxhash
   - pyproj

diff --git a/setup.cfg b/setup.cfg
@@ -45,12 +45,12 @@ version = attr: iris.__version__
 [options]
 include_package_data = True
 install_requires =
-    cartopy>=0.20
+    cartopy>=0.21
     cf-units>=3.1
     cftime>=1.5.0
     dask[array]>=2
     matplotlib
-    netcdf4
+    netcdf4!=1.6.1
     numpy>=1.19
     scipy
     shapely!=1.8.3