Mergeback v0.17.x back on to main

.cirrus.yml

@@ -24,7 +24,7 @@ env:
   NOX_CACHE_BUILD: "98"
   # Increment the build number to force new pip cache upload.
   PIP_CACHE_BUILD: "98"
-  # Pip package to be upgraded/installed.
+  # Pip packages to be upgraded/installed.
   PIP_CACHE_PACKAGES: "pip setuptools wheel nox pyyaml"
   # Base directory for the iris-test-data.
   IRIS_TEST_DATA_DIR: ${HOME}/iris-test-data
@@ -33,22 +33,22 @@ env:
 
 #
 # Linting
-# [2021-03-01] jamesp: Currently not black or flake compliant.  
-#                      GitHub issues open #251 and #252
-# lint_task:
-#   auto_cancellation: true
-#   name: "${CIRRUS_OS}: flake8 and black"
-#   pip_cache:
-#     folder: ~/.cache/pip
-#     fingerprint_script:
-#       - echo "${CIRRUS_TASK_NAME}"
-#       - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${PIP_CACHE_BUILD} ${PIP_CACHE_PACKAGES}"
-#   lint_script:
-#     - pip list
-#     - python -m pip install --retries 3 --upgrade ${PIP_CACHE_PACKAGES}
-#     - pip list
-#     - nox --session flake8
-#     - nox --session black
+# [2021-03-01] jamesp: Currently not black compliant.  
+#                      GitHub issue open #251
+lint_task:
+  auto_cancellation: true
+  name: "${CIRRUS_OS}: flake8" # and black
+  pip_cache:
+    folder: ~/.cache/pip
+    fingerprint_script:
+      - echo "${CIRRUS_TASK_NAME}"
+      - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${PIP_CACHE_BUILD} ${PIP_CACHE_PACKAGES}"
+  lint_script:
+    - pip list
+    - python -m pip install --retries 3 --upgrade ${PIP_CACHE_PACKAGES}
+    - pip list
+    - nox --session flake8
+#    - nox --session black
 
 
 #
@@ -80,10 +80,10 @@ linux_task_template: &LINUX_TASK_TEMPLATE
       - conda install --quiet --name base nox pip coverage pyyaml
   nox_cache:
     folder: ${CIRRUS_WORKING_DIR}/.nox
+    reupload_on_changes: true
     fingerprint_script:
       - echo "${CIRRUS_TASK_NAME}"
-      - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${NOX_CACHE_BUILD}"
-      - sha256sum ${CIRRUS_WORKING_DIR}/requirements/ci/py$(echo ${PY_VER} | tr -d ".").yml
+      - echo "${NOX_CACHE_BUILD}"
       - echo "IRIS ${IRIS_SOURCE}"
   data_cache:
     folder: ${IRIS_TEST_DATA_DIR}
@@ -96,14 +96,11 @@ linux_task_template: &LINUX_TASK_TEMPLATE
 
 tests_task:
   matrix:
-    - name: "${CIRRUS_OS} tests: iris=repo-main python=3.7"
-      env:
-        PY_VER: 3.7
-        IRIS_SOURCE: "source"
-    - name: "${CIRRUS_OS} tests: iris=repo-main python=3.8"
-      env:
-        PY_VER: 3.8
-        IRIS_SOURCE: "source"
+    # TODO: iris-grib does not currently work with iris-main
+    #- name: "${CIRRUS_OS} tests: iris=repo-main python=3.8"
+    #  env:
+    #    PY_VER: 3.8
+    #    IRIS_SOURCE: "source"
     - name: "${CIRRUS_OS} tests: iris=conda-release python=3.7"
       env:
         PY_VER: 3.7
@@ -117,3 +114,14 @@ tests_task:
   tests_script:
     - export CONDA_OVERRIDE_LINUX="$(uname -r | cut -d'+' -f1)"
     - nox --session tests -- --test-data-dir ${IRIS_TEST_DATA_DIR}/test_data
+
+# [2021-06-07] lbdreyer: Doctests are failing, see Github Issue #274
+#doctest_task:
+#  matrix:
+#    env:
+#      PY_VER: 3.7
+#  name: "${CIRRUS_OS}: py${PY_VER} tests"
+#  << : *LINUX_TASK_TEMPLATE
+#  tests_script:
+#    - export CONDA_OVERRIDE_LINUX="$(uname -r | cut -d'+' -f1)"
+#    - nox --session doctest -- --test-data-dir ${IRIS_TEST_DATA_DIR}/test_data

.flake8

@@ -0,0 +1,4 @@
+[flake8]
+exclude = 
+    # Auto-generated file
+    iris_grib/_grib_cf_map.py

docs/conf.py

@@ -50,7 +50,7 @@
 
 # General information about the project.
 project = u'iris-grib'
-copyright = u'2016, Met Office'
+copyright = u'2021, Met Office'
 author = u'Met Office'
 
 # The version info for the project you're documenting, acts as replacement for

docs/index.rst

@@ -3,7 +3,7 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Iris-grib v0.16
+Iris-grib v0.17
 ===============
 
 The library ``iris-grib`` provides functionality for converting between weather and

docs/ref/release_notes.rst

@@ -2,6 +2,58 @@ Release Notes
 =============
 
 
+What's new in iris-grib v0.17.1
+-------------------------------
+
+:Release: 0.17.1
+:Date: 8 June 2021
+
+Bugs Fixed
+^^^^^^^^^^
+
+* `@TomDufall <https://github.com/TomDufall>`_ removed the empty slice
+  handling (originally added in v0.15.1) as this used  
+  iris.util._array_slice_ifempty which was removed in Iris v3.0.2 and is no
+  longer necessary.
+  `(PR#270) <https://github.com/SciTools/iris-grib/pull/270>`_
+
+
+Dependencies
+^^^^^^^^^^^^
+
+* now requires Iris version >= 3.0.2.
+
+* now requires Python version >= 3.7.
+
+
+
+What's new in iris-grib v0.17
+-----------------------------
+
+:Release: 0.17.0
+:Date: 18 May 2021
+
+Features
+^^^^^^^^
+
+* `@m1dr <https://github.com/m1dr>`_ added support for GRIB regulation 92.1.8 
+  for loading GRIB files where the longitude increment is not given.
+  `(PR#261) <https://github.com/SciTools/iris-grib/pull/261>`_
+
+* `@lbdreyer <https://github.com/lbdreyer>`_ added support for loading grid 
+  point and spectral data with CCSDS recommended lossless compression, i.e. 
+  data representation template 42.
+  `(PR#264) <https://github.com/SciTools/iris-grib/pull/264>`_
+
+
+Internal
+^^^^^^^^
+
+* `@jamesp <https://github.com/jamesp>`_ moved CI testing to Cirrus CI.
+  `(PR#250) <https://github.com/SciTools/iris-grib/pull/250>`_
+
+
+
 What's new in iris-grib v0.16
 -----------------------------
 

iris_grib/__init__.py

@@ -12,7 +12,6 @@
 
 import datetime
 import math  # for fmod
-import warnings
 
 import cartopy.crs as ccrs
 import cf_units
@@ -21,7 +20,7 @@
 import numpy.ma as ma
 
 # NOTE: careful here, to avoid circular imports (as iris imports grib)
-import iris
+import iris  # noqa: F401
 from iris._lazy_data import as_lazy_data
 import iris.coord_systems as coord_systems
 from iris.exceptions import TranslationError, NotYetImplementedError
@@ -32,7 +31,7 @@
 from .message import GribMessage
 
 
-__version__ = '0.17.dev0'
+__version__ = '0.18.dev0'
 
 __all__ = ['load_cubes', 'save_grib2', 'load_pairs_from_fields',
            'save_pairs_from_cube', 'save_messages']