Updating feature branch unstructured_scheme from e528cbf to head of main, b32e134

Author: stephenworsley

.cirrus.yml

@@ -20,7 +20,7 @@ env:
   SKIP_TEST_TASK: ""
   SKIP_BENCHMARK_TASK: ""
   # Maximum cache period (in weeks) before forcing a new cache upload.
-  CACHE_PERIOD: "2"
+  CACHE_PERIOD: "0"
   # Increment the build number to force new conda cache upload.
   CONDA_CACHE_BUILD: "0"
   # Increment the build number to force new nox cache upload.
@@ -31,6 +31,27 @@ env:
   PIP_CACHE_PACKAGES: "pip setuptools wheel nox pyyaml"
   # Conda packages to be installed.
   CONDA_CACHE_PACKAGES: "nox pip pyyaml"
+  # Use specific custom iris source feature branch.
+  IRIS_SOURCE: "github:main"
+  # Git commit hash for iris test data.
+  IRIS_TEST_DATA_VERSION: "2.2"
+  # Base directory for the iris-test-data.
+  IRIS_TEST_DATA_DIR: ${HOME}/iris-test-data
+  OVERRIDE_TEST_DATA_REPOSITORY: ${IRIS_TEST_DATA_DIR}/test_data
+
+
+#
+# YAML alias for the iris-test-data cache.
+#
+iris_test_data_template: &IRIS_TEST_DATA_TEMPLATE
+  data_cache:
+    folder: ${IRIS_TEST_DATA_DIR}
+    fingerprint_script:
+      - echo "iris-test-data v${IRIS_TEST_DATA_VERSION}"
+    populate_script:
+      - wget --quiet https://github.com/SciTools/iris-test-data/archive/v${IRIS_TEST_DATA_VERSION}.zip -O iris-test-data.zip
+      - unzip -q iris-test-data.zip
+      - mv iris-test-data-${IRIS_TEST_DATA_VERSION} ${IRIS_TEST_DATA_DIR}
 
 
 #
@@ -88,10 +109,6 @@ test_task:
   only_if: ${SKIP_TEST_TASK} == ""
   auto_cancellation: true
   matrix:
-    env:
-      PY_VER: "3.6"
-    env:
-      PY_VER: "3.7"
     env:
       PY_VER: "3.8"
       COVERAGE: "true"
@@ -104,6 +121,7 @@ test_task:
       - echo "${CIRRUS_TASK_NAME}"
       - echo "${NOX_CACHE_BUILD}"
       - if [ -n "${IRIS_SOURCE}" ]; then echo "${IRIS_SOURCE}"; fi
+  << : *IRIS_TEST_DATA_TEMPLATE
   test_script:
     - export CONDA_OVERRIDE_LINUX="$(uname -r | cut -d'+' -f1)"
     - nox --session tests -- --verbose

benchmarks/benchmarks/__init__.py

@@ -1 +1,44 @@
 """Benchmark tests for iris-esmf-regrid"""
+
+
+def disable_repeat_between_setup(benchmark_object):
+    """
+    Decorator for benchmarks where object persistence would be inappropriate.
+
+    E.g:
+        * Data is realised during testing.
+
+    Can be applied to benchmark classes/methods/functions.
+
+    https://asv.readthedocs.io/en/stable/benchmarks.html#timing-benchmarks
+
+    """
+    # Prevent repeat runs between setup() runs - object(s) will persist after 1st.
+    benchmark_object.number = 1
+    # Compensate for reduced certainty by increasing number of repeats.
+    #  (setup() is run between each repeat).
+    #  Minimum 5 repeats, run up to 30 repeats / 20 secs whichever comes first.
+    benchmark_object.repeat = (5, 30, 20.0)
+    # ASV uses warmup to estimate benchmark time before planning the real run.
+    #  Prevent this, since object(s) will persist after first warmup run,
+    #  which would give ASV misleading info (warmups ignore ``number``).
+    benchmark_object.warmup_time = 0.0
+
+    return benchmark_object
+
+
+def skip_benchmark(benchmark_object):
+    """
+    Decorator for benchmarks skipping benchmarks.
+    """
+
+    def setup_cache(self):
+        pass
+
+    def setup(*args):
+        raise NotImplementedError
+
+    benchmark_object.setup_cache = setup_cache
+    benchmark_object.setup = setup
+
+    return benchmark_object