Lockfile fixes

changelog/7299.internal.1.rst

@@ -0,0 +1 @@
+Fix 1d-plot adjustment for line directions, for cartopy >= 0.26.

changelog/7299.internal.rst

@@ -0,0 +1 @@
+Fix shape-masking test for more stable results.

lib/iris/plot.py

@@ -754,6 +754,11 @@ def _shift_plot_sections(u_object, u, v):
     endpoints = points[1:, :2]
     proj_x, proj_y, _ = tgt_proj.transform_points(src_crs, u, v).T
 
+    # Wrap proj_x into range -180..+180, as that's what the following logic needs.
+    # N.B. upto cartopy v0.26, this was true anyway, but has since changed.
+    # see : https://github.com/SciTools/cartopy/issues/2747
+    proj_x = (proj_x + 540.0) % 360.0 - 180.0
+
     # Calculate the inverse geodesic for each pair of points in turn, and
     # convert the start point's azimuth into a vector in the source coordinate
     # system.

lib/iris/tests/integration/_shapefiles/test_create_shape_mask.py

@@ -30,8 +30,9 @@ def square_polygon():
 
 @pytest.fixture
 def circle_polygon():
-    # Create a a circular polygon centred on (5,5) with radius (2,) using shapely
-    return Point(5, 5).buffer(2)
+    # Create a circular polygon centred on (5,5) with radius 2.1 using shapely
+    # - offset by 0.1 to avoid inclusion of some test points being 'marginal'
+    return Point(5, 5).buffer(2.1)
 
 
 @pytest.fixture
@@ -149,10 +150,10 @@ def test_all_touched_true_create_shape_mask(circle_polygon, wgs84_crs, mock_cube
             [1, 1, 1, 1, 1, 1, 1, 1, 1],
             [1, 1, 1, 1, 0, 0, 1, 1, 1],
             [1, 1, 1, 0, 0, 0, 0, 1, 1],
+            [1, 1, 0, 0, 0, 0, 0, 0, 1],
+            [1, 1, 0, 0, 0, 0, 0, 0, 1],
             [1, 1, 1, 0, 0, 0, 0, 1, 1],
-            [1, 1, 1, 0, 0, 0, 0, 1, 1],
-            [1, 1, 1, 0, 0, 0, 0, 1, 1],
-            [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            [1, 1, 1, 1, 0, 0, 1, 1, 1],
             [1, 1, 1, 1, 1, 1, 1, 1, 1],
         ],
         dtype=bool,

lib/iris/tests/unit/plot/test_plot.py

@@ -96,7 +96,7 @@ def assert_paths_equal(self, expected, actual):
         # Remove Path.STOP vertices
         everts = expected.vertices[np.where(expected.codes != Path.STOP)]
         averts = actual.vertices[np.where(actual.codes != Path.STOP)]
-        _shared_utils.assert_array_almost_equal(everts, averts)
+        _shared_utils.assert_array_almost_equal(everts, averts, decimal=5)
         _shared_utils.assert_array_equal(expected.codes, actual.codes)
 
     def check_paths(self, expected_path, expected_path_crs, lines, axes):