From e945e2044f9155bf7e8c885c9b7155f5208a7364 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Mon, 5 Jul 2021 12:49:53 +0100 Subject: [PATCH 1/4] Update __init__.py --- lib/iris/experimental/ugrid/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/iris/experimental/ugrid/__init__.py b/lib/iris/experimental/ugrid/__init__.py index 8eefedb6ea..035fe576e0 100644 --- a/lib/iris/experimental/ugrid/__init__.py +++ b/lib/iris/experimental/ugrid/__init__.py @@ -3643,7 +3643,7 @@ def _build_connectivity(connectivity_var, file_path, location_dims): indices_data = netcdf._get_cf_var_data(connectivity_var, file_path) cf_role = connectivity_var.cf_role - start_index = connectivity_var.start_index + start_index = getattr(connectivity_var, 'start_index', None) dim_names = connectivity_var.dimensions # Connectivity arrays must have two dimensions. From d3c4701207b6a64eaaf9598eb8e536ebcfb1c525 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 5 Jul 2021 11:52:28 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- lib/iris/experimental/ugrid/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/iris/experimental/ugrid/__init__.py b/lib/iris/experimental/ugrid/__init__.py index 035fe576e0..b3f85d830e 100644 --- a/lib/iris/experimental/ugrid/__init__.py +++ b/lib/iris/experimental/ugrid/__init__.py @@ -3643,7 +3643,7 @@ def _build_connectivity(connectivity_var, file_path, location_dims): indices_data = netcdf._get_cf_var_data(connectivity_var, file_path) cf_role = connectivity_var.cf_role - start_index = getattr(connectivity_var, 'start_index', None) + start_index = getattr(connectivity_var, "start_index", None) dim_names = connectivity_var.dimensions # Connectivity arrays must have two dimensions. From 5b56b33b3a35c7252e306caf75212cc987f15847 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Mon, 5 Jul 2021 17:56:03 +0100 Subject: [PATCH 3/4] Fix default start_index --- lib/iris/experimental/ugrid/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/iris/experimental/ugrid/__init__.py b/lib/iris/experimental/ugrid/__init__.py index b3f85d830e..138e532e30 100644 --- a/lib/iris/experimental/ugrid/__init__.py +++ b/lib/iris/experimental/ugrid/__init__.py @@ -3643,7 +3643,7 @@ def _build_connectivity(connectivity_var, file_path, location_dims): indices_data = netcdf._get_cf_var_data(connectivity_var, file_path) cf_role = connectivity_var.cf_role - start_index = getattr(connectivity_var, "start_index", None) + start_index = getattr(connectivity_var, "start_index", 0) dim_names = connectivity_var.dimensions # Connectivity arrays must have two dimensions. From e2ac80c540bf1e06cf19a4eaa23647a15573faad Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Tue, 6 Jul 2021 15:42:19 +0100 Subject: [PATCH 4/4] Remove ref from imagerepo.json, matching #4115, to please test-iris-imagehash#44. --- lib/iris/tests/results/imagerepo.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/iris/tests/results/imagerepo.json b/lib/iris/tests/results/imagerepo.json index d73c8492e5..f5730795da 100644 --- a/lib/iris/tests/results/imagerepo.json +++ b/lib/iris/tests/results/imagerepo.json @@ -23,8 +23,7 @@ "gallery_tests.test_plot_anomaly_log_colouring.TestAnomalyLogColouring.test_plot_anomaly_log_colouring.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/ec4464e185a39f93931e9b1e91696d2949dde6e63e26a47a5ad391938d9a5a0c.png", "https://scitools.github.io/test-iris-imagehash/images/v4/ecc164e78e979b19b3789b0885a564a56cc2c65e3ec69469db1bdb9a853c1e24.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/ece164e68e979b19b3781b0885a564a56ccac65e3ec69469db1bdb9a853c1e24.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/ece164e796979a1b39781b2881a564a56ccac6da3e87947bcb1bdb9a843c1e24.png" + "https://scitools.github.io/test-iris-imagehash/images/v4/ece164e68e979b19b3781b0885a564a56ccac65e3ec69469db1bdb9a853c1e24.png" ], "gallery_tests.test_plot_atlantic_profiles.TestAtlanticProfiles.test_plot_atlantic_profiles.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/9f8260536bd28e1320739437b5f437b0a51d66f4cc5d08fcd00fdb1c93fcb21c.png",