diff --git a/.cirrus.yml b/.cirrus.yml index 839ef7fc77..3a3989e46c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -26,7 +26,7 @@ env: # Maximum cache period (in weeks) before forcing a new cache upload. CACHE_PERIOD: "2" # Increment the build number to force new cartopy cache upload. - CARTOPY_CACHE_BUILD: "0" + CARTOPY_CACHE_BUILD: "3" # Increment the build number to force new conda cache upload. CONDA_CACHE_BUILD: "0" # Increment the build number to force new nox cache upload. @@ -72,6 +72,14 @@ linux_task_template: &LINUX_TASK_TEMPLATE fingerprint_script: - echo "${CIRRUS_OS}" - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${CARTOPY_CACHE_BUILD}" + populate_script: + - conda create --quiet --name cartopy-cache cartopy + - source ${HOME}/miniconda/etc/profile.d/conda.sh >/dev/null 2>&1 + - conda activate cartopy-cache >/dev/null 2>&1 + - cd $(mktemp -d) + - wget --quiet https://raw.githubusercontent.com/SciTools/cartopy/master/tools/cartopy_feature_download.py + - python cartopy_feature_download.py physical --output ${HOME}/.local/share/cartopy --no-warn + - conda deactivate >/dev/null 2>&1 nox_cache: folder: ${CIRRUS_WORKING_DIR}/.nox reupload_on_changes: true diff --git a/docs/src/common_links.inc b/docs/src/common_links.inc index d59f98de47..e22b37c87e 100644 --- a/docs/src/common_links.inc +++ b/docs/src/common_links.inc @@ -2,6 +2,7 @@ Common resources in alphabetical order: .. _black: https://black.readthedocs.io/en/stable/ +.. _cartopy: https://github.com/SciTools/cartopy .. _.cirrus.yml: https://github.com/SciTools/iris/blob/main/.cirrus.yml .. _flake8: https://flake8.pycqa.org/en/stable/ .. _.flake8.yml: https://github.com/SciTools/iris/blob/main/.flake8 diff --git a/docs/src/whatsnew/1.3.rst b/docs/src/whatsnew/1.3.rst index beaa594ab5..1895711379 100644 --- a/docs/src/whatsnew/1.3.rst +++ b/docs/src/whatsnew/1.3.rst @@ -34,8 +34,8 @@ Loading ABF/ABL Files --------------------- Support for the ABF and ABL file formats (as -`defined `_ by the -climate and vegetation research group of Boston University), is +`defined `_ +by the climate and vegetation research group of Boston University), is currently provided under the "experimental" system. As such, ABF/ABL file detection is not automatically enabled. diff --git a/lib/iris/fileformats/abf.py b/lib/iris/fileformats/abf.py index c031bfb415..678d9b04cf 100644 --- a/lib/iris/fileformats/abf.py +++ b/lib/iris/fileformats/abf.py @@ -10,7 +10,7 @@ Including this module adds ABF and ABL loading to the session's capabilities. The documentation for this file format can be found -`here `_. +`here `_. """ diff --git a/lib/iris/fileformats/netcdf.py b/lib/iris/fileformats/netcdf.py index 60da5c5e97..9dd8848f7f 100644 --- a/lib/iris/fileformats/netcdf.py +++ b/lib/iris/fileformats/netcdf.py @@ -6,7 +6,7 @@ """ Module to support the loading of a NetCDF file into an Iris cube. -See also: `netCDF4 python `_. +See also: `netCDF4 python `_ Also refer to document 'NetCDF Climate and Forecast (CF) Metadata Conventions'.