diff --git a/CHANGES b/CHANGES index cdb2b64f84..b3916a97b6 100644 --- a/CHANGES +++ b/CHANGES @@ -373,7 +373,7 @@ Features added Incompatible changes -------------------- -* The Iris data model is now fully aligned with the `CF data model `_ . +* The Iris data model is now fully aligned with the `CF data model `_ . Iris remains file-format independent, as is the underlying CF data model. * Cube merging has been re-written for the new CF data model with the benefit that some corner cases are now better handled. Some users may find that their cubes, once merged, now have a smaller total shape and more intelligent handling of dimension coordinate picking. @@ -433,7 +433,7 @@ Features added given cubes (see :func:`iris.iterate.izip`). * Cell methods will now appear in the printout of a cube. * Supporting software dependency versions have been updated. Of particular note is matplotlib which has gone from version 1.0.1 - up to `1.1.0 `_ . This may have a small impact on + up to `1.1.0 `_ . This may have a small impact on some plot element placements. Incompatible changes diff --git a/README.md b/README.md index f857608718..233c0edd39 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ developer version or the most recent released alt="#showyourstripes Global 1850-2021"> -**Graphics and Lead Scientist**: [Ed Hawkins](http://www.met.reading.ac.uk/~ed/home/index.php), National Centre for Atmospheric Science, University of Reading. +**Graphics and Lead Scientist**: [Ed Hawkins](https://www.met.reading.ac.uk/~ed/home/index.php), National Centre for Atmospheric Science, University of Reading. **Data**: Berkeley Earth, NOAA, UK Met Office, MeteoSwiss, DWD, SMHI, UoR, Meteo France & ZAMG. diff --git a/benchmarks/asv.conf.json b/benchmarks/asv.conf.json index fab5bcb44e..4184629448 100644 --- a/benchmarks/asv.conf.json +++ b/benchmarks/asv.conf.json @@ -4,7 +4,7 @@ "project_url": "https://github.com/SciTools/iris", "repo": "..", "environment_type": "conda-delegated", - "show_commit_url": "http://github.com/scitools/iris/commit/", + "show_commit_url": "https://github.com/scitools/iris/commit/", "branches": ["upstream/main"], "benchmark_dir": "./benchmarks", diff --git a/docs/gallery_code/general/plot_anomaly_log_colouring.py b/docs/gallery_code/general/plot_anomaly_log_colouring.py index 9a9383650d..02b60f957d 100644 --- a/docs/gallery_code/general/plot_anomaly_log_colouring.py +++ b/docs/gallery_code/general/plot_anomaly_log_colouring.py @@ -21,7 +21,7 @@ :meth:`iris.plot.pcolormesh`, which call the underlying matplotlib functions of the same names (i.e., :obj:`matplotlib.pyplot.pcolor` and :obj:`matplotlib.pyplot.pcolormesh`). -See also: http://en.wikipedia.org/wiki/False_color#Pseudocolor. +See also: https://en.wikipedia.org/wiki/False_color#Pseudocolor. """ @@ -62,7 +62,7 @@ def main(): # Use a standard colour map which varies blue-white-red. # For suitable options, see the 'Diverging colormaps' section in: - # http://matplotlib.org/stable/gallery/color/colormap_reference.html + # https://matplotlib.org/stable/gallery/color/colormap_reference.html anom_cmap = "bwr" # Create a 'logarithmic' data normalization. diff --git a/docs/src/IEP/IEP001.adoc b/docs/src/IEP/IEP001.adoc index e43969f3ce..2daef2363a 100644 --- a/docs/src/IEP/IEP001.adoc +++ b/docs/src/IEP/IEP001.adoc @@ -162,12 +162,12 @@ There is a risk that this topic could bog down when dealing with non-standard ca * Boolean array indexing * Lambdas? * What to do about constrained loading? -* Relationship to http://scitools.org.uk/iris/docs/v1.9.2/iris/iris/cube.html#iris.cube.Cube.intersection[iris.cube.Cube.intersection]? +* Relationship to https://scitools.org.uk/iris/docs/v1.9.2/iris/iris/cube.html#iris.cube.Cube.intersection[iris.cube.Cube.intersection]? * Relationship to interpolation (especially nearest-neighbour)? ** e.g. What to do about values that don't exist? *** pandas throws a KeyError -*** xarray supports (several) nearest-neighbour schemes via http://xarray.pydata.org/en/stable/indexing.html#nearest-neighbor-lookups[`data.sel()`] -*** Apparently http://holoviews.org/[holoviews] does nearest-neighbour interpolation. +*** xarray supports (several) nearest-neighbour schemes via https://xarray.pydata.org/en/stable/indexing.html#nearest-neighbor-lookups[`data.sel()`] +*** Apparently https://holoviews.org/[holoviews] does nearest-neighbour interpolation. * multi-dimensional coordinate => unroll? * var_name only selection? `cube.vloc(t0=12)` * Orthogonal only? Or also independent? `cube.loc_points(lon=[1, 1, 5], lat=[31, 33, 32])` @@ -185,9 +185,9 @@ cube.interpolate( ## References . Iris - * http://scitools.org.uk/iris/docs/v1.9.2/iris/iris.html#iris.Constraint[iris.Constraint] - * http://scitools.org.uk/iris/docs/v1.9.2/userguide/subsetting_a_cube.html[Subsetting a cube] -. http://pandas.pydata.org/pandas-docs/stable/indexing.html[pandas indexing] -. http://xarray.pydata.org/en/stable/indexing.html[xarray indexing] -. http://legacy.python.org/dev/peps/pep-0472/[PEP 472 - Support for indexing with keyword arguments] -. http://nbviewer.jupyter.org/gist/rsignell-usgs/13d7ce9d95fddb4983d4cbf98be6c71d[Time slicing NetCDF or OPeNDAP datasets] - Rich Signell's xarray/iris comparison focussing on time handling and performance + * https://scitools.org.uk/iris/docs/v1.9.2/iris/iris.html#iris.Constraint[iris.Constraint] + * https://scitools.org.uk/iris/docs/v1.9.2/userguide/subsetting_a_cube.html[Subsetting a cube] +. https://pandas.pydata.org/pandas-docs/stable/indexing.html[pandas indexing] +. https://xarray.pydata.org/en/stable/indexing.html[xarray indexing] +. https://legacy.python.org/dev/peps/pep-0472/[PEP 472 - Support for indexing with keyword arguments] +. https://nbviewer.jupyter.org/gist/rsignell-usgs/13d7ce9d95fddb4983d4cbf98be6c71d[Time slicing NetCDF or OPeNDAP datasets] - Rich Signell's xarray/iris comparison focussing on time handling and performance diff --git a/docs/src/conf.py b/docs/src/conf.py index c59aca4909..ea12b83aaf 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -380,19 +380,19 @@ def _dotv(version): # url link checker. Some links work but report as broken, lets ignore them. # See https://www.sphinx-doc.org/en/1.2/config.html#options-for-the-linkcheck-builder linkcheck_ignore = [ - "http://catalogue.ceda.ac.uk/uuid/82adec1f896af6169112d09cc1174499", - "http://cfconventions.org", - "http://code.google.com/p/msysgit/downloads/list", - "http://effbot.org", + "https://catalogue.ceda.ac.uk/uuid/82adec1f896af6169112d09cc1174499", + "https://cfconventions.org", + "https://code.google.com/p/msysgit/downloads/list", + "https://effbot.org", "https://help.github.com", "https://docs.github.com", "https://github.com", - "http://www.personal.psu.edu/cab38/ColorBrewer/ColorBrewer_updates.html", - "http://scitools.github.com/cartopy", - "http://www.wmo.int/pages/prog/www/DPFS/documents/485_Vol_I_en_colour.pdf", + "https://www.personal.psu.edu/cab38/ColorBrewer/ColorBrewer_updates.html", + "https://scitools.github.com/cartopy", + "https://www.wmo.int/pages/prog/www/DPFS/documents/485_Vol_I_en_colour.pdf", "https://software.ac.uk/how-cite-software", - "http://www.esrl.noaa.gov/psd/data/gridded/conventions/cdc_netcdf_standard.shtml", - "http://www.nationalarchives.gov.uk/doc/open-government-licence", + "https://www.esrl.noaa.gov/psd/data/gridded/conventions/cdc_netcdf_standard.shtml", + "https://www.nationalarchives.gov.uk/doc/open-government-licence", "https://www.metoffice.gov.uk/", "https://biggus.readthedocs.io/", "https://stickler-ci.com/", diff --git a/docs/src/copyright.rst b/docs/src/copyright.rst index d5996fd999..513d281c07 100644 --- a/docs/src/copyright.rst +++ b/docs/src/copyright.rst @@ -29,7 +29,7 @@ are licensed under the UK's Open Government Licence: You may use and re-use the information featured on this website (not including logos) free of charge in any format or medium, under the terms of the - `Open Government Licence `_. + `Open Government Licence `_. We encourage users to establish hypertext links to this website. Any email enquiries regarding the use and re-use of this information resource should be diff --git a/docs/src/developers_guide/contributing_deprecations.rst b/docs/src/developers_guide/contributing_deprecations.rst index 0b22e2cbd2..8c5cb21feb 100644 --- a/docs/src/developers_guide/contributing_deprecations.rst +++ b/docs/src/developers_guide/contributing_deprecations.rst @@ -7,7 +7,7 @@ If you need to make a backwards-incompatible change to a public API [#public-api]_ that has been included in a release (e.g. deleting a method), then you must first deprecate the old behaviour in at least one release, before removing/updating it in the next -`major release `_. +`major release `_. Adding a Deprecation diff --git a/docs/src/developers_guide/contributing_documentation_full.rst b/docs/src/developers_guide/contributing_documentation_full.rst index df850cb2c4..5cb5269fa1 100755 --- a/docs/src/developers_guide/contributing_documentation_full.rst +++ b/docs/src/developers_guide/contributing_documentation_full.rst @@ -101,7 +101,7 @@ run:: See :data:`iris.cube.Cube.data` for an example of using the `doctest`_ approach. -.. _doctest: http://www.sphinx-doc.org/en/stable/ext/doctest.html +.. _doctest: https://www.sphinx-doc.org/en/stable/ext/doctest.html The hyperlinks in the documentation can be checked automatically. If there is a link that is known to work it can be excluded from the checks by diff --git a/docs/src/developers_guide/documenting/rest_guide.rst b/docs/src/developers_guide/documenting/rest_guide.rst index c4330b1e63..9e8c1107b0 100644 --- a/docs/src/developers_guide/documenting/rest_guide.rst +++ b/docs/src/developers_guide/documenting/rest_guide.rst @@ -15,14 +15,14 @@ source format. This guide will cover some of the more frequently used advanced reST markup syntaxes, for the basics of reST the following links may be useful: * https://www.sphinx-doc.org/en/master/usage/restructuredtext/ -* http://packages.python.org/an_example_pypi_project/sphinx.html +* https://packages.python.org/an_example_pypi_project/sphinx.html -Reference documentation for reST can be found at http://docutils.sourceforge.net/rst.html. +Reference documentation for reST can be found at https://docutils.sourceforge.net/rst.html. Creating Links -------------- -Basic links can be created with ```Text of the link `_`` -which will look like `Text of the link `_ +Basic links can be created with ```Text of the link `_`` +which will look like `Text of the link `_ Documents in the same project can be cross referenced with the syntax @@ -41,4 +41,4 @@ syntax ``:py:class:`zipfile.ZipFile``` which will result in links such as :py:class:`zipfile.ZipFile` and :py:class:`numpy.ndarray`. -.. _reST: http://en.wikipedia.org/wiki/ReStructuredText +.. _reST: https://en.wikipedia.org/wiki/ReStructuredText diff --git a/docs/src/developers_guide/gitwash/LICENSE b/docs/src/developers_guide/gitwash/LICENSE index 0ea9a5957b..cd8441c161 100644 --- a/docs/src/developers_guide/gitwash/LICENSE +++ b/docs/src/developers_guide/gitwash/LICENSE @@ -3,7 +3,7 @@ ========= We release the documents under the Creative Commons attribution license: -http://creativecommons.org/licenses/by/3.0/ +https://creativecommons.org/licenses/by/3.0/ We release the code under the simplified BSD license: diff --git a/docs/src/developers_guide/gitwash/git_links.inc b/docs/src/developers_guide/gitwash/git_links.inc index bf20d13e5f..3ced13703f 100644 --- a/docs/src/developers_guide/gitwash/git_links.inc +++ b/docs/src/developers_guide/gitwash/git_links.inc @@ -8,11 +8,11 @@ __not_case_sensitive__, so only one target definition is needed for nipy, NIPY, Nipy, etc... -.. _git: http://git-scm.com/ +.. _git: https://git-scm.com/ .. _github: https://github.com .. _github help: https://help.github.com .. _git documentation: https://git-scm.com/docs -.. _linux git workflow: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html +.. _linux git workflow: https://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html .. |emdash| unicode:: U+02014 diff --git a/docs/src/developers_guide/release.rst b/docs/src/developers_guide/release.rst index 97d7918148..c7ce230204 100644 --- a/docs/src/developers_guide/release.rst +++ b/docs/src/developers_guide/release.rst @@ -280,7 +280,7 @@ For further details on how to test Iris, see :ref:`developer_running_tests`. .. _rc_iris: https://anaconda.org/conda-forge/iris/labels .. _Generating Distribution Archives: https://packaging.python.org/tutorials/packaging-projects/#generating-distribution-archives .. _Packaging Your Project: https://packaging.python.org/guides/distributing-packages-using-setuptools/#packaging-your-project -.. _latest CF standard names: http://cfconventions.org/Data/cf-standard-names/current/src/cf-standard-name-table.xml +.. _latest CF standard names: https://cfconventions.org/Data/cf-standard-names/current/src/cf-standard-name-table.xml .. _setuptools-scm: https://github.com/pypa/setuptools_scm .. _Semantic Versioning: https://semver.org/ .. _PEP 440: https://peps.python.org/pep-0440/ diff --git a/docs/src/further_topics/ugrid/data_model.rst b/docs/src/further_topics/ugrid/data_model.rst index 0b4334e0f0..cad461340d 100644 --- a/docs/src/further_topics/ugrid/data_model.rst +++ b/docs/src/further_topics/ugrid/data_model.rst @@ -38,7 +38,7 @@ The Detail (e.g. Inkscape). They were originally made in MS PowerPoint. Uses the IBM Colour Blind Palette (see - http://ibm-design-language.eu-de.mybluemix.net/design/language/resources/color-library + https://ibm-design-language.eu-de.mybluemix.net/design/language/resources/color-library ) Structured Grids (the old world) diff --git a/docs/src/further_topics/um_files_loading.rst b/docs/src/further_topics/um_files_loading.rst index 9d9393f16d..c5238e6b70 100644 --- a/docs/src/further_topics/um_files_loading.rst +++ b/docs/src/further_topics/um_files_loading.rst @@ -31,14 +31,14 @@ Notes: #. Iris treats Fieldsfile data almost exactly as if it were PP -- i.e. it treats each field's lookup table entry like a PP header. #. The Iris data model is based on - `NetCDF CF conventions `_, so most of this can + `NetCDF CF conventions `_, so most of this can also be seen as a metadata translation between PP and CF terms, but it is easier to discuss in terms of Iris elements. For details of Iris terms (cubes, coordinates, attributes), refer to :ref:`Iris data structures `. -For details of CF conventions, see http://cfconventions.org/. +For details of CF conventions, see https://cfconventions.org/. Overview of Loading Process --------------------------- @@ -335,7 +335,7 @@ Time Information In Iris (as in CF) times and time intervals are both expressed as simple numbers, following the approach of the -`UDUNITS project `_. +`UDUNITS project `_. These values are stored as cube coordinates, where the scaling and calendar information is contained in the :attr:`~iris.coords.Coord.units` property. diff --git a/docs/src/index.rst b/docs/src/index.rst index b353406f58..a9bf76fc96 100644 --- a/docs/src/index.rst +++ b/docs/src/index.rst @@ -8,7 +8,7 @@ Iris **A powerful, format-agnostic, community-driven Python package for analysing and visualising Earth science data.** -Iris implements a data model based on the `CF conventions `_ +Iris implements a data model based on the `CF conventions `_ giving you a powerful, format-agnostic interface for working with your data. It excels when working with multi-dimensional Earth Science data, where tabular representations become unwieldy and inefficient. diff --git a/docs/src/userguide/cube_maths.rst b/docs/src/userguide/cube_maths.rst index 56a2041bd3..79c91ca61b 100644 --- a/docs/src/userguide/cube_maths.rst +++ b/docs/src/userguide/cube_maths.rst @@ -115,7 +115,7 @@ Notice that the calculation of the *anomaly* involves subtracting a because cube broadcasting is performed during cube arithmetic operations. Cube broadcasting follows similar broadcasting rules as -`NumPy `_, but +`NumPy `_, but the additional richness of Iris coordinate meta-data provides an enhanced capability beyond the basic broadcasting behaviour of NumPy. diff --git a/docs/src/userguide/glossary.rst b/docs/src/userguide/glossary.rst index 5c24f03372..6ab93125bd 100644 --- a/docs/src/userguide/glossary.rst +++ b/docs/src/userguide/glossary.rst @@ -22,7 +22,7 @@ Glossary This also forms the data model which iris is based on. | **Related:** :term:`NetCDF Format` - | **More information:** `CF Conventions `_ + | **More information:** `CF Conventions `_ | Coordinate @@ -188,7 +188,7 @@ Glossary Standard Name A name describing a :term:`phenomenon`, one from a fixed list - defined at `CF Standard Names `_. + defined at `CF Standard Names `_. | **Related:** :term:`Long Name` **|** :term:`Cube` | **More information:** :doc:`iris_cubes` diff --git a/docs/src/userguide/plotting_a_cube.rst b/docs/src/userguide/plotting_a_cube.rst index 70a1fbba91..f152690835 100644 --- a/docs/src/userguide/plotting_a_cube.rst +++ b/docs/src/userguide/plotting_a_cube.rst @@ -209,7 +209,7 @@ the temperature at some latitude cross-sections. that any useful functions or variables defined within the script can be imported into other scripts without running all of the code and thus creating an unwanted plot. This is discussed in more detail at - ``_. + ``_. In order to run this example, you will need to copy the code into a file and run it using ``python my_file.py``. @@ -285,7 +285,7 @@ These colour schemes are freely available under the following licence:: Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -293,7 +293,7 @@ These colour schemes are freely available under the following licence:: specific language governing permissions and limitations under the License. To include a reference in a journal article or report please refer to -`section 5 `_ +`section 5 `_ in the citation guidance provided by Cynthia Brewer. For adding citations to Iris plots, see :ref:`brewer-cite` (below). diff --git a/docs/src/userguide/real_and_lazy_data.rst b/docs/src/userguide/real_and_lazy_data.rst index e4c041886c..2b3ecf9e64 100644 --- a/docs/src/userguide/real_and_lazy_data.rst +++ b/docs/src/userguide/real_and_lazy_data.rst @@ -233,7 +233,7 @@ both Iris cubes and coordinates, and for computing deferred operations on lazy a Dask provides processing options to control how deferred operations on lazy arrays are computed. This is provided via the ``dask.set_options`` interface. See the -`dask documentation `_ +`dask documentation `_ for more information on setting dask processing options. diff --git a/docs/src/whatsnew/1.0.rst b/docs/src/whatsnew/1.0.rst index c256c33566..a2456c12db 100644 --- a/docs/src/whatsnew/1.0.rst +++ b/docs/src/whatsnew/1.0.rst @@ -83,7 +83,7 @@ CF Name For convenience, Iris also includes the :class:`~iris.coord_systems.OSGB` class which provides a simple way to create the transverse Mercator coordinate system used by the British -`Ordnance Survey `_. +`Ordnance Survey `_. .. _whats-new-cartopy: @@ -92,7 +92,7 @@ Using Cartopy for Mapping in Matplotlib --------------------------------------- The underlying map drawing package has now been updated to use -`Cartopy `_. Cartopy provides a +`Cartopy `_. Cartopy provides a highly flexible set of mapping tools, with a consistent, intuitive interface. As yet it doesn't have feature-parity with basemap, but its goal is to make maps "just work", making it the perfect complement to Iris. @@ -132,7 +132,7 @@ interface: and :func:`matplotlib.pyplot.gca` should be used instead. For more examples of what can be done with Cartopy, see the Iris gallery and -`Cartopy's documentation `_. +`Cartopy's documentation `_. Hybrid-Pressure @@ -202,7 +202,7 @@ function. The recommended text for the Cynthia Brewer citation is provided by :data:`iris.plot.BREWER_CITE`. To include a reference in a journal article or report please refer to -`section 5 `_ +`section 5 `_ in the citation guidance provided by Cynthia Brewer. diff --git a/docs/src/whatsnew/1.13.rst b/docs/src/whatsnew/1.13.rst index 028c298505..4a2ecd8dbe 100644 --- a/docs/src/whatsnew/1.13.rst +++ b/docs/src/whatsnew/1.13.rst @@ -51,7 +51,7 @@ Bug Fixes * The CF conventions state that certain ``formula_terms`` terms may be omitted and assumed to be zero - (http://cfconventions.org/cf-conventions/v1.6.0/cf-conventions.html#dimensionless-v-coord) + (https://cfconventions.org/cf-conventions/v1.6.0/cf-conventions.html#dimensionless-v-coord) so Iris now allows factories to be constructed with missing terms. * In the User Guide's contour plot example, clabel inline is set to be False diff --git a/docs/src/whatsnew/1.4.rst b/docs/src/whatsnew/1.4.rst index 912a1e3bad..24a98488af 100644 --- a/docs/src/whatsnew/1.4.rst +++ b/docs/src/whatsnew/1.4.rst @@ -58,7 +58,7 @@ Features * Use the latest release of Cartopy, v0.8.0. -.. _OPeNDAP: http://www.opendap.org +.. _OPeNDAP: https://www.opendap.org .. _exp-regrid: Experimental Regridding Enhancements @@ -132,7 +132,7 @@ Cubes can now be loaded directly from the internet, via OPeNDAP_. For example:: - cubes = iris.load("http://geoport.whoi.edu/thredds/dodsC/bathy/gom15") + cubes = iris.load("https://geoport.whoi.edu/thredds/dodsC/bathy/gom15") .. _geotiff_export: diff --git a/docs/src/whatsnew/1.6.rst b/docs/src/whatsnew/1.6.rst index f1c50a3f08..4b179b67d6 100644 --- a/docs/src/whatsnew/1.6.rst +++ b/docs/src/whatsnew/1.6.rst @@ -40,7 +40,7 @@ Features iris.Constraint(time=lambda cell: cell.point.month != 1 and cell.point.day != 1) Note that, :class:`iris.Future` also supports a - `context manager `_ + `context manager `_ which allows multiple sections of code to execute with different run-time behaviour. diff --git a/docs/src/whatsnew/2.0.rst b/docs/src/whatsnew/2.0.rst index 4ef50a4101..1ee159c662 100644 --- a/docs/src/whatsnew/2.0.rst +++ b/docs/src/whatsnew/2.0.rst @@ -295,6 +295,6 @@ Documentation .. _Biggus: https://biggus.readthedocs.io/en/latest/ -.. _Dask: http://dask.pydata.org/en/latest/ +.. _Dask: https://dask.pydata.org/en/latest/ .. _iris_grib: https://github.com/SciTools/iris-grib/ -.. _schedulers: http://dask.pydata.org/en/latest/scheduler-overview.html +.. _schedulers: https://dask.pydata.org/en/latest/scheduler-overview.html diff --git a/docs/src/whatsnew/2.3.rst b/docs/src/whatsnew/2.3.rst index 9220bb89da..bec45a6603 100644 --- a/docs/src/whatsnew/2.3.rst +++ b/docs/src/whatsnew/2.3.rst @@ -29,7 +29,7 @@ Features .. admonition:: Climatological Coordinate Support Iris can now load, store and save `NetCDF climatological coordinates - `_. Any cube time coordinate can be marked as a climatological time axis using the boolean property: ``climatological``. The climatological bounds are stored in the @@ -41,7 +41,7 @@ Features coordinate's ``bounds`` property are written to a NetCDF boundary variable called '_bounds'. These are in place of a standard 'bounds' attribute and accompanying boundary variable. See below - for an `example adapted from CF conventions `_: @@ -116,7 +116,7 @@ Features * New coordinate system: :class:`iris.coord_systems.Geostationary`, including load and save support, based on the `CF Geostationary projection - definition `_. * :class:`iris.coord_systems.VerticalPerspective` can now be saved to and @@ -126,7 +126,7 @@ Features :class:`iris.analysis.PointInCell` to make this regridding scheme public * Iris now supports standard name modifiers. See - `Appendix C, Standard Name Modifiers `_ + `Appendix C, Standard Name Modifiers `_ for more information. * :meth:`iris.cube.Cube.remove_cell_measure` now also allows removal of a cell @@ -138,10 +138,10 @@ Features realisation of the original cube data. * Iris now supports NetCDF Climate and Forecast (CF) Metadata Conventions 1.7 - (see `CF 1.7 Conventions Document `_ for more information) + (see `CF 1.7 Conventions Document `_ for more information) * Updated standard name support to - `CF standard name table version 70, 2019-12-10 `_ + `CF standard name table version 70, 2019-12-10 `_ * Updated UM STASH translations to `metarelate/metOcean commit 448f2ef, 2019-11-29 `_ @@ -164,7 +164,7 @@ Bugs Fixed points. * :class:`iris.coord_systems.VerticalPerspective` coordinate system now uses - the `CF Vertical perspective definition `_; had been erroneously using Geostationary. diff --git a/docs/src/whatsnew/3.1.rst b/docs/src/whatsnew/3.1.rst index 744543f514..02e06bb532 100644 --- a/docs/src/whatsnew/3.1.rst +++ b/docs/src/whatsnew/3.1.rst @@ -281,7 +281,7 @@ This document explains the changes made to Iris for this release (:pull:`4198`) #. `@lbdreyer`_ updated the CF standard name table to the latest version: - `v77 `_. + `v77 `_. (:pull:`4282`) #. `@jamesp`_ updated a test to the latest numpy version (:pull:`3977`) @@ -322,4 +322,4 @@ This document explains the changes made to Iris for this release .. _Python 3.6: https://www.python.org/downloads/release/python-360/ .. _Python 3.8: https://www.python.org/downloads/release/python-380/ .. _README.md: https://github.com/SciTools/iris#----- -.. _xxhash: http://cyan4973.github.io/xxHash/ +.. _xxhash: https://cyan4973.github.io/xxHash/ diff --git a/docs/src/whatsnew/3.2.rst b/docs/src/whatsnew/3.2.rst index 87a85f9061..ce544a5ecc 100644 --- a/docs/src/whatsnew/3.2.rst +++ b/docs/src/whatsnew/3.2.rst @@ -332,7 +332,7 @@ v3.2.1 (11 Mar 2022) =========== #. `@trexfeathers`_ set the linkcheck to ignore - http://www.nationalarchives.gov.uk/doc/open-government-licence since this + https://www.nationalarchives.gov.uk/doc/open-government-licence since this always works locally, but never within CI. (:pull:`4307`) #. `@wjbenfold`_ netCDF integration tests now skip ``TestConstrainedLoad`` if @@ -399,7 +399,7 @@ v3.2.1 (11 Mar 2022) Whatsnew resources in alphabetical order: .. _NEP-29: https://numpy.org/neps/nep-0029-deprecation_policy.html -.. _UGRID: http://ugrid-conventions.github.io/ugrid-conventions/ +.. _UGRID: https://ugrid-conventions.github.io/ugrid-conventions/ .. _iris-emsf-regrid: https://github.com/SciTools-incubator/iris-esmf-regrid .. _faster documentation building: https://docs.readthedocs.io/en/stable/guides/conda.html#making-builds-faster-with-mamba .. _sort-all: https://github.com/aio-libs/sort-all diff --git a/docs/src/why_iris.rst b/docs/src/why_iris.rst index 82b791b4bd..6c9b5fb7fb 100644 --- a/docs/src/why_iris.rst +++ b/docs/src/why_iris.rst @@ -6,12 +6,12 @@ Why Iris **A powerful, format-agnostic, community-driven Python package for analysing and visualising Earth science data.** -Iris implements a data model based on the `CF conventions `_ +Iris implements a data model based on the `CF conventions `_ giving you a powerful, format-agnostic interface for working with your data. It excels when working with multi-dimensional Earth Science data, where tabular representations become unwieldy and inefficient. -`CF Standard names `_, +`CF Standard names `_, `units `_, and coordinate metadata are built into Iris, giving you a rich and expressive interface for maintaining an accurate representation of your data. Its treatment of data and @@ -33,7 +33,7 @@ A number of file formats are recognised by Iris, including CF-compliant NetCDF, GRIB, and PP, and it has a plugin architecture to allow other formats to be added seamlessly. -Building upon `NumPy `_ and +Building upon `NumPy `_ and `dask `_, Iris scales from efficient single-machine workflows right through to multi-core clusters and HPC. Interoperability with packages from the wider scientific Python ecosystem comes diff --git a/lib/iris/analysis/maths.py b/lib/iris/analysis/maths.py index a24203ba2a..d17d3ea93c 100644 --- a/lib/iris/analysis/maths.py +++ b/lib/iris/analysis/maths.py @@ -740,7 +740,7 @@ def apply_ufunc( ): """ Apply a `numpy universal function - `_ to a cube + `_ to a cube or pair of cubes. .. note:: Many of the numpy.ufunc have been implemented explicitly in Iris diff --git a/lib/iris/common/mixin.py b/lib/iris/common/mixin.py index a1b1e4647b..b6cd3132b5 100644 --- a/lib/iris/common/mixin.py +++ b/lib/iris/common/mixin.py @@ -68,7 +68,7 @@ class LimitedAttributeDict(dict): :data:`iris.common.mixin.LimitedAttributeDict.CF_ATTRS_FORBIDDEN` . All the forbidden attributes are amongst those listed in - `Appendix A of the CF Conventions: `_ + `Appendix A of the CF Conventions: `_ -- however, not *all* of them, since not all are interpreted by Iris. """ diff --git a/lib/iris/cube.py b/lib/iris/cube.py index 8aa0b452d5..0018a5abe8 100644 --- a/lib/iris/cube.py +++ b/lib/iris/cube.py @@ -1103,7 +1103,7 @@ def __setitem__(self, key, value): **However** a handful of "known normally global" cases, as defined by CF, go into ``.globals`` instead. At present these are : ('conventions', 'featureType', 'history', 'title'). - See `CF Conventions, Appendix A: `_ . + See `CF Conventions, Appendix A: `_ . """ # If an attribute of this name is already present, update that diff --git a/lib/iris/etc/palette/diverging/BrBG_11.txt b/lib/iris/etc/palette/diverging/BrBG_11.txt index 7243c178ae..bf1c566f81 100644 --- a/lib/iris/etc/palette/diverging/BrBG_11.txt +++ b/lib/iris/etc/palette/diverging/BrBG_11.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -16,7 +16,7 @@ # scheme: diverging # keyword: anomaly # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.329412 0.188235 0.019608 diff --git a/lib/iris/etc/palette/diverging/PRGn_11.txt b/lib/iris/etc/palette/diverging/PRGn_11.txt index 32fdee2871..e78d56e04d 100644 --- a/lib/iris/etc/palette/diverging/PRGn_11.txt +++ b/lib/iris/etc/palette/diverging/PRGn_11.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -16,7 +16,7 @@ # scheme: diverging # keyword: anomaly # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.250980 0.000000 0.294118 diff --git a/lib/iris/etc/palette/diverging/PiYG_11.txt b/lib/iris/etc/palette/diverging/PiYG_11.txt index b52c50acbc..826c48e361 100644 --- a/lib/iris/etc/palette/diverging/PiYG_11.txt +++ b/lib/iris/etc/palette/diverging/PiYG_11.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -16,7 +16,7 @@ # scheme: diverging # keyword: anomaly # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.556863 0.003922 0.321569 diff --git a/lib/iris/etc/palette/diverging/PuOr_11.txt b/lib/iris/etc/palette/diverging/PuOr_11.txt index 8e9c32b8d0..4785c4b536 100644 --- a/lib/iris/etc/palette/diverging/PuOr_11.txt +++ b/lib/iris/etc/palette/diverging/PuOr_11.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -17,7 +17,7 @@ # std_name: air_pressure_at_sea_level # keyword: anomaly # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.176471 0.000000 0.294118 diff --git a/lib/iris/etc/palette/diverging/RdBu_11.txt b/lib/iris/etc/palette/diverging/RdBu_11.txt index 526132e2a0..f7da164953 100644 --- a/lib/iris/etc/palette/diverging/RdBu_11.txt +++ b/lib/iris/etc/palette/diverging/RdBu_11.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -16,7 +16,7 @@ # scheme: diverging # keyword: anomaly, temperature # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.019608 0.188235 0.380392 diff --git a/lib/iris/etc/palette/diverging/RdGy_11.txt b/lib/iris/etc/palette/diverging/RdGy_11.txt index c8ade7f388..0b8ae55480 100644 --- a/lib/iris/etc/palette/diverging/RdGy_11.txt +++ b/lib/iris/etc/palette/diverging/RdGy_11.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -16,7 +16,7 @@ # scheme: diverging # keyword: anomaly # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.403922 0.000000 0.121569 diff --git a/lib/iris/etc/palette/diverging/RdYlBu_11.txt b/lib/iris/etc/palette/diverging/RdYlBu_11.txt index 84cc3dd2c2..5d799e8e77 100644 --- a/lib/iris/etc/palette/diverging/RdYlBu_11.txt +++ b/lib/iris/etc/palette/diverging/RdYlBu_11.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -16,7 +16,7 @@ # scheme: diverging # keyword: anomaly # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.647059 0.000000 0.149020 diff --git a/lib/iris/etc/palette/diverging/RdYlGn_11.txt b/lib/iris/etc/palette/diverging/RdYlGn_11.txt index f1d626d493..d17ff39177 100644 --- a/lib/iris/etc/palette/diverging/RdYlGn_11.txt +++ b/lib/iris/etc/palette/diverging/RdYlGn_11.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -16,7 +16,7 @@ # scheme: diverging # keyword: anomaly # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.647059 0.000000 0.149020 diff --git a/lib/iris/etc/palette/diverging/Spectral_11.txt b/lib/iris/etc/palette/diverging/Spectral_11.txt index 03eaa98f7f..f2a4447846 100644 --- a/lib/iris/etc/palette/diverging/Spectral_11.txt +++ b/lib/iris/etc/palette/diverging/Spectral_11.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -16,7 +16,7 @@ # scheme: diverging # keyword: anomaly # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.619608 0.003922 0.258824 diff --git a/lib/iris/etc/palette/qualitative/Accent_08.txt b/lib/iris/etc/palette/qualitative/Accent_08.txt index 9b1f3c49c3..bb13fcb5a9 100644 --- a/lib/iris/etc/palette/qualitative/Accent_08.txt +++ b/lib/iris/etc/palette/qualitative/Accent_08.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Accent_08 # scheme: qualitative # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.498039 0.788235 0.498039 diff --git a/lib/iris/etc/palette/qualitative/Dark2_08.txt b/lib/iris/etc/palette/qualitative/Dark2_08.txt index bd33878e10..5d1599a31b 100644 --- a/lib/iris/etc/palette/qualitative/Dark2_08.txt +++ b/lib/iris/etc/palette/qualitative/Dark2_08.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Dark2_08 # scheme: qualitative # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.105882 0.619608 0.466667 diff --git a/lib/iris/etc/palette/qualitative/Paired_12.txt b/lib/iris/etc/palette/qualitative/Paired_12.txt index b4efea1c92..8b8154ff3b 100644 --- a/lib/iris/etc/palette/qualitative/Paired_12.txt +++ b/lib/iris/etc/palette/qualitative/Paired_12.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Paired_12 # scheme: qualitative # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.650980 0.807843 0.890196 diff --git a/lib/iris/etc/palette/qualitative/Pastel1_09.txt b/lib/iris/etc/palette/qualitative/Pastel1_09.txt index fb6ef6d0a8..042009995e 100644 --- a/lib/iris/etc/palette/qualitative/Pastel1_09.txt +++ b/lib/iris/etc/palette/qualitative/Pastel1_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Pastel1_09 # scheme: qualitative # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.984314 0.705882 0.682353 diff --git a/lib/iris/etc/palette/qualitative/Pastel2_08.txt b/lib/iris/etc/palette/qualitative/Pastel2_08.txt index 1fda519549..05b30fef0b 100644 --- a/lib/iris/etc/palette/qualitative/Pastel2_08.txt +++ b/lib/iris/etc/palette/qualitative/Pastel2_08.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Pastel2_08 # scheme: qualitative # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.701961 0.886275 0.803922 diff --git a/lib/iris/etc/palette/qualitative/Set1_09.txt b/lib/iris/etc/palette/qualitative/Set1_09.txt index 3dd2145930..a2f9f57c4b 100644 --- a/lib/iris/etc/palette/qualitative/Set1_09.txt +++ b/lib/iris/etc/palette/qualitative/Set1_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Set1_09 # scheme: qualitative # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.894118 0.101961 0.109804 diff --git a/lib/iris/etc/palette/qualitative/Set2_08.txt b/lib/iris/etc/palette/qualitative/Set2_08.txt index a643828a22..40cfa0d738 100644 --- a/lib/iris/etc/palette/qualitative/Set2_08.txt +++ b/lib/iris/etc/palette/qualitative/Set2_08.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Set2_08 # scheme: qualitative # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.400000 0.760784 0.647059 diff --git a/lib/iris/etc/palette/qualitative/Set3_12.txt b/lib/iris/etc/palette/qualitative/Set3_12.txt index 589352fc60..33bdaf372c 100644 --- a/lib/iris/etc/palette/qualitative/Set3_12.txt +++ b/lib/iris/etc/palette/qualitative/Set3_12.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Set3_12 # scheme: qualitative # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.552941 0.827451 0.780392 diff --git a/lib/iris/etc/palette/sequential/Blues_09.txt b/lib/iris/etc/palette/sequential/Blues_09.txt index 37c7e6082c..d489a46d61 100644 --- a/lib/iris/etc/palette/sequential/Blues_09.txt +++ b/lib/iris/etc/palette/sequential/Blues_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -16,7 +16,7 @@ # scheme: sequential # keyword: lwe_precipitation, convective_precipitation, stratiform_precipitation, precipitation_amount # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.968627 0.984314 1.000000 diff --git a/lib/iris/etc/palette/sequential/BuGn_09.txt b/lib/iris/etc/palette/sequential/BuGn_09.txt index 28b5bfc11f..cde85b422c 100644 --- a/lib/iris/etc/palette/sequential/BuGn_09.txt +++ b/lib/iris/etc/palette/sequential/BuGn_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: BuGn_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.968627 0.988235 0.992157 diff --git a/lib/iris/etc/palette/sequential/BuPu_09.txt b/lib/iris/etc/palette/sequential/BuPu_09.txt index 6e0596ec80..99fafcc208 100644 --- a/lib/iris/etc/palette/sequential/BuPu_09.txt +++ b/lib/iris/etc/palette/sequential/BuPu_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: BuPu_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.968627 0.988235 0.992157 diff --git a/lib/iris/etc/palette/sequential/GnBu_09.txt b/lib/iris/etc/palette/sequential/GnBu_09.txt index 0225f496e7..cb3fa28c4a 100644 --- a/lib/iris/etc/palette/sequential/GnBu_09.txt +++ b/lib/iris/etc/palette/sequential/GnBu_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: GnBu_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.968627 0.988235 0.941176 diff --git a/lib/iris/etc/palette/sequential/Greens_09.txt b/lib/iris/etc/palette/sequential/Greens_09.txt index 8900459b58..e338e6b9b0 100644 --- a/lib/iris/etc/palette/sequential/Greens_09.txt +++ b/lib/iris/etc/palette/sequential/Greens_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Greens_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.968627 0.988235 0.960784 diff --git a/lib/iris/etc/palette/sequential/Greys_09.txt b/lib/iris/etc/palette/sequential/Greys_09.txt index d76ec0e6a1..b8d047938f 100644 --- a/lib/iris/etc/palette/sequential/Greys_09.txt +++ b/lib/iris/etc/palette/sequential/Greys_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Greys_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 1.000000 1.000000 1.000000 diff --git a/lib/iris/etc/palette/sequential/OrRd_09.txt b/lib/iris/etc/palette/sequential/OrRd_09.txt index 3e081719a7..3da55efc6f 100644 --- a/lib/iris/etc/palette/sequential/OrRd_09.txt +++ b/lib/iris/etc/palette/sequential/OrRd_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: OrRd_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 1.000000 0.968627 0.925490 diff --git a/lib/iris/etc/palette/sequential/Oranges_09.txt b/lib/iris/etc/palette/sequential/Oranges_09.txt index 022be59e99..d5793340aa 100644 --- a/lib/iris/etc/palette/sequential/Oranges_09.txt +++ b/lib/iris/etc/palette/sequential/Oranges_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Oranges_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 1.000000 0.960784 0.921569 diff --git a/lib/iris/etc/palette/sequential/PuBuGn_09.txt b/lib/iris/etc/palette/sequential/PuBuGn_09.txt index 264289cdba..38740edcf5 100644 --- a/lib/iris/etc/palette/sequential/PuBuGn_09.txt +++ b/lib/iris/etc/palette/sequential/PuBuGn_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: PuBuGn_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 1.000000 0.968627 0.984314 diff --git a/lib/iris/etc/palette/sequential/PuBu_09.txt b/lib/iris/etc/palette/sequential/PuBu_09.txt index e07b960f0b..44f6c6f01b 100644 --- a/lib/iris/etc/palette/sequential/PuBu_09.txt +++ b/lib/iris/etc/palette/sequential/PuBu_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: PuBu_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 1.000000 0.968627 0.984314 diff --git a/lib/iris/etc/palette/sequential/PuRd_09.txt b/lib/iris/etc/palette/sequential/PuRd_09.txt index 19589fb4ad..402584291a 100644 --- a/lib/iris/etc/palette/sequential/PuRd_09.txt +++ b/lib/iris/etc/palette/sequential/PuRd_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: PuRd_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.968627 0.956863 0.976471 diff --git a/lib/iris/etc/palette/sequential/Purples_09.txt b/lib/iris/etc/palette/sequential/Purples_09.txt index 338dd3d021..1b5811271c 100644 --- a/lib/iris/etc/palette/sequential/Purples_09.txt +++ b/lib/iris/etc/palette/sequential/Purples_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Purples_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 0.988235 0.984314 0.992157 diff --git a/lib/iris/etc/palette/sequential/RdPu_09.txt b/lib/iris/etc/palette/sequential/RdPu_09.txt index a21e4b9000..71054bf397 100644 --- a/lib/iris/etc/palette/sequential/RdPu_09.txt +++ b/lib/iris/etc/palette/sequential/RdPu_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: RdPu_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 1.000000 0.968627 0.952941 diff --git a/lib/iris/etc/palette/sequential/Reds_09.txt b/lib/iris/etc/palette/sequential/Reds_09.txt index d03594e058..445001df64 100644 --- a/lib/iris/etc/palette/sequential/Reds_09.txt +++ b/lib/iris/etc/palette/sequential/Reds_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: Reds_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 1.000000 0.960784 0.941176 diff --git a/lib/iris/etc/palette/sequential/YlGnBu_09.txt b/lib/iris/etc/palette/sequential/YlGnBu_09.txt index 733d1aebca..e1699f1f5b 100644 --- a/lib/iris/etc/palette/sequential/YlGnBu_09.txt +++ b/lib/iris/etc/palette/sequential/YlGnBu_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: YlGnBu_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 1.000000 1.000000 0.850980 diff --git a/lib/iris/etc/palette/sequential/YlGn_09.txt b/lib/iris/etc/palette/sequential/YlGn_09.txt index 1242b90d59..efbecd5ea7 100644 --- a/lib/iris/etc/palette/sequential/YlGn_09.txt +++ b/lib/iris/etc/palette/sequential/YlGn_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: YlGn_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 1.000000 1.000000 0.898039 diff --git a/lib/iris/etc/palette/sequential/YlOrBr_09.txt b/lib/iris/etc/palette/sequential/YlOrBr_09.txt index f6d93c5b9a..caf8886f83 100644 --- a/lib/iris/etc/palette/sequential/YlOrBr_09.txt +++ b/lib/iris/etc/palette/sequential/YlOrBr_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: YlOrBr_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 1.000000 1.000000 0.898039 diff --git a/lib/iris/etc/palette/sequential/YlOrRd_09.txt b/lib/iris/etc/palette/sequential/YlOrRd_09.txt index b252f6f684..4d50f5034d 100644 --- a/lib/iris/etc/palette/sequential/YlOrRd_09.txt +++ b/lib/iris/etc/palette/sequential/YlOrRd_09.txt @@ -5,7 +5,7 @@ # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software distributed # under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR @@ -15,7 +15,7 @@ # name: YlOrRd_09 # scheme: sequential # interpolate: off -# source: http://colorbrewer.org/ +# source: https://colorbrewer.org/ # type: RGB # 1.000000 1.000000 0.800000 diff --git a/lib/iris/experimental/raster.py b/lib/iris/experimental/raster.py index 6fe12ea82a..5cc3b4f710 100644 --- a/lib/iris/experimental/raster.py +++ b/lib/iris/experimental/raster.py @@ -6,7 +6,7 @@ Experimental module for importing/exporting raster data from Iris cubes using the GDAL library. -See also: `GDAL - Geospatial Data Abstraction Library `_. +See also: `GDAL - Geospatial Data Abstraction Library `_. TODO: If this module graduates from experimental the (optional) GDAL dependency should be added to INSTALL @@ -120,7 +120,7 @@ def export_geotiff(cube, fname): .. note:: For more details on GeoTiff specification and PixelIsArea, see: - http://www.remotesensing.org/geotiff/spec/geotiff2.5.html#2.5.2.2 + https://www.remotesensing.org/geotiff/spec/geotiff2.5.html#2.5.2.2 """ wmsg = ( diff --git a/lib/iris/experimental/regrid_conservative.py b/lib/iris/experimental/regrid_conservative.py index 83e65f89af..ccea4277d3 100644 --- a/lib/iris/experimental/regrid_conservative.py +++ b/lib/iris/experimental/regrid_conservative.py @@ -105,7 +105,7 @@ def _make_esmpy_field( # NOTE: we don't care about Iris' idea of where the points 'really' are # *but* ESMF requires the data in the CENTER for conservative regrid, # according to the documentation : - # - http://www.earthsystemmodeling.org/ + # - https://www.earthsystemmodeling.org/ # esmf_releases/public/last/ESMF_refdoc.pdf # - section 22.2.3 : ESMF_REGRIDMETHOD # diff --git a/lib/iris/fileformats/netcdf/saver.py b/lib/iris/fileformats/netcdf/saver.py index b0bff313e9..5bfc8754fb 100644 --- a/lib/iris/fileformats/netcdf/saver.py +++ b/lib/iris/fileformats/netcdf/saver.py @@ -612,7 +612,7 @@ def write( using `numpy.around(scale*data)/scale`, where `scale = 2**bits`, and `bits` is determined so that a precision of 0.1 is retained (in this case `bits=4`). From - `here `__: + `here `__: "least_significant_digit -- power of ten of the smallest decimal place in unpacked data that is a reliable value". Default is `None`, or no quantization, or 'lossless' compression. @@ -2765,7 +2765,7 @@ def save( Used to manually specify the HDF5 chunksizes for each dimension of the variable. A detailed discussion of HDF chunking and I/O performance is available - `here `__. + `here `__. Basically, you want the chunk size for each dimension to match as closely as possible the size of the data block that users will read from the file. `chunksizes` cannot be set if `contiguous=True`. @@ -2795,7 +2795,7 @@ def save( of packing parameters as described below or an iterable of such types, strings, or dicts. This provides support for netCDF data packing as described in - `here `__ + `here `__ If this argument is a type (or type string), appropriate values of scale_factor and add_offset will be automatically calculated based on `cube.data` and possible masking. For more control, pass a dict with diff --git a/lib/iris/fileformats/nimrod.py b/lib/iris/fileformats/nimrod.py index d4e86502bd..f4033cfb1d 100644 --- a/lib/iris/fileformats/nimrod.py +++ b/lib/iris/fileformats/nimrod.py @@ -173,7 +173,7 @@ class NimrodField: References: Met Office (2003): Met Office Rain Radar Data from the NIMROD System. NCAS British Atmospheric Data Centre, date of citation. - http://catalogue.ceda.ac.uk/uuid/82adec1f896af6169112d09cc1174499 + https://catalogue.ceda.ac.uk/uuid/82adec1f896af6169112d09cc1174499 """ diff --git a/lib/iris/io/__init__.py b/lib/iris/io/__init__.py index 87725789e5..08586c81b7 100644 --- a/lib/iris/io/__init__.py +++ b/lib/iris/io/__init__.py @@ -99,8 +99,8 @@ def decode_uri(uri, default="file"): Examples -------- >>> from iris.io import decode_uri - >>> print(decode_uri('http://www.thing.com:8080/resource?id=a:b')) - ('http', '//www.thing.com:8080/resource?id=a:b') + >>> print(decode_uri('https://www.thing.com:8080/resource?id=a:b')) + ('https', '//www.thing.com:8080/resource?id=a:b') >>> print(decode_uri('file:///data/local/dataZoo/...')) ('file', '///data/local/dataZoo/...') @@ -127,7 +127,7 @@ def decode_uri(uri, default="file"): if isinstance(uri, str): # make sure scheme has at least 2 letters to avoid windows drives # put - last in the brackets so it refers to the character, not a range - # reference on valid schemes: http://tools.ietf.org/html/std66#section-3.1 + # reference on valid schemes: https://tools.ietf.org/html/std66#section-3.1 match = re.match(r"^([a-zA-Z][a-zA-Z0-9+.-]+):(.+)", uri) if match: scheme = match.group(1) diff --git a/lib/iris/pandas.py b/lib/iris/pandas.py index 535bed3a64..05447c0c48 100644 --- a/lib/iris/pandas.py +++ b/lib/iris/pandas.py @@ -5,7 +5,7 @@ """ Provide conversion to and from Pandas data structures. -See also: http://pandas.pydata.org/ +See also: https://pandas.pydata.org/ """ import datetime diff --git a/lib/iris/symbols.py b/lib/iris/symbols.py index 7bbbca83a9..2a8f447f3a 100644 --- a/lib/iris/symbols.py +++ b/lib/iris/symbols.py @@ -231,7 +231,7 @@ def _wedge_fix(wedge_path): """ A dictionary mapping WMO cloud cover codes to their corresponding symbol. -See http://www.wmo.int/pages/prog/www/DPFS/documents/485_Vol_I_en_colour.pdf +See https://www.wmo.int/pages/prog/www/DPFS/documents/485_Vol_I_en_colour.pdf Part II, Appendix II.4, Graphical Representation of Data, Analyses and Forecasts diff --git a/lib/iris/tests/test_io_init.py b/lib/iris/tests/test_io_init.py index 852944eee5..57b6c2a963 100644 --- a/lib/iris/tests/test_io_init.py +++ b/lib/iris/tests/test_io_init.py @@ -34,9 +34,9 @@ def test_decode_uri__str(self): uri[:4], uri[5:], ), - (uri := "http://www.somehost.com:8080/resource/thing.grib"): ( - uri[:4], - uri[5:], + (uri := "https://www.somehost.com:8080/resource/thing.grib"): ( + uri[:5], + uri[6:], ), (uri := "/data/local/someDir/2013-11-25T13:49:17.632797"): ( "file", @@ -151,7 +151,7 @@ def test_open_dap(self): # tests that *ANY* http or https URL is seen as an OPeNDAP service. # This may need to change in the future if other protocols are # supported. - DAP_URI = "http://geoport.whoi.edu/thredds/dodsC/bathy/gom15" + DAP_URI = "https://geoport.whoi.edu/thredds/dodsC/bathy/gom15" a = iff.FORMAT_AGENT.get_spec(DAP_URI, None) self.assertEqual(a.name, "NetCDF OPeNDAP") diff --git a/lib/iris/tests/test_load.py b/lib/iris/tests/test_load.py index 1189f74b55..93ea4ef913 100644 --- a/lib/iris/tests/test_load.py +++ b/lib/iris/tests/test_load.py @@ -151,7 +151,7 @@ def test_path_object(self): class TestOPeNDAP(tests.IrisTest): def setUp(self): - self.url = "http://geoport.whoi.edu:80/thredds/dodsC/bathy/gom15" + self.url = "https://geoport.whoi.edu:80/thredds/dodsC/bathy/gom15" def test_load_http_called(self): # Check that calling iris.load_* with an http URI triggers a call to diff --git a/lib/iris/tests/unit/analysis/geometry/test_geometry_area_weights.py b/lib/iris/tests/unit/analysis/geometry/test_geometry_area_weights.py index ae0e47292d..b83278c3b0 100644 --- a/lib/iris/tests/unit/analysis/geometry/test_geometry_area_weights.py +++ b/lib/iris/tests/unit/analysis/geometry/test_geometry_area_weights.py @@ -139,7 +139,7 @@ def test_distinct_xy_bounds_pole(self): miny = 84.99998474121094 maxy = 99.99998474121094 geometry = shapely.geometry.box(minx, miny, maxx, maxy) - # see http://stackoverflow.com/a/3892301 to assert warnings + # see https://stackoverflow.com/a/3892301 to assert warnings with warnings.catch_warnings(record=True) as w: warnings.simplefilter("always") # always trigger all warnings weights = geometry_area_weights(cube, geometry) diff --git a/lib/iris/tests/unit/experimental/ugrid/load/test_load_meshes.py b/lib/iris/tests/unit/experimental/ugrid/load/test_load_meshes.py index 1ec3e65a97..40d839951b 100644 --- a/lib/iris/tests/unit/experimental/ugrid/load/test_load_meshes.py +++ b/lib/iris/tests/unit/experimental/ugrid/load/test_load_meshes.py @@ -210,13 +210,13 @@ def setUp(self): ) def test_http(self): - url = "http://foo" + url = "https://foo" with PARSE_UGRID_ON_LOAD.context(): _ = load_meshes(url) self.format_agent_mock.assert_called_with(url, None) def test_mixed_sources(self): - url = "http://foo" + url = "https://foo" file = TMP_DIR / f"{uuid4()}.nc" file.touch() glob = f"{TMP_DIR}/*.nc" diff --git a/lib/iris/tests/unit/time/test_PartialDateTime.py b/lib/iris/tests/unit/time/test_PartialDateTime.py index 8223f4a518..6ed00943b9 100644 --- a/lib/iris/tests/unit/time/test_PartialDateTime.py +++ b/lib/iris/tests/unit/time/test_PartialDateTime.py @@ -57,7 +57,7 @@ def test_empty(self): class Test_timetuple(tests.IrisTest): def test_exists(self): # Check that the PartialDateTime class implements a timetuple (needed - # because of http://bugs.python.org/issue8005). + # because of https://bugs.python.org/issue8005). pd = PartialDateTime(*list(range(7))) self.assertTrue(hasattr(pd, "timetuple")) diff --git a/lib/iris/time.py b/lib/iris/time.py index 6ba85a0051..f2bc4a08ce 100644 --- a/lib/iris/time.py +++ b/lib/iris/time.py @@ -42,7 +42,7 @@ class PartialDateTime: #: A dummy value provided as a workaround to allow comparisons with #: :class:`datetime.datetime`. - #: See http://bugs.python.org/issue8005. + #: See https://bugs.python.org/issue8005. #: NB. It doesn't even matter what this value is. timetuple = None diff --git a/tools/generate_std_names.py b/tools/generate_std_names.py index 8e3b24aac6..85372b7cc7 100644 --- a/tools/generate_std_names.py +++ b/tools/generate_std_names.py @@ -12,8 +12,8 @@ By default, Iris will use the source XML file: etc/cf-standard-name-table.xml as obtained from: - http://cfconventions.org/standard-names.html - E.G. http://cfconventions.org/Data/cf-standard-names/78/src/cf-standard-name-table.xml + https://cfconventions.org/standard-names.html + E.G. https://cfconventions.org/Data/cf-standard-names/78/src/cf-standard-name-table.xml - N.B. no fixed 'latest' url is provided. """ diff --git a/tools/release_do_nothing.py b/tools/release_do_nothing.py index 94f2d96829..634e6a65a2 100755 --- a/tools/release_do_nothing.py +++ b/tools/release_do_nothing.py @@ -186,7 +186,7 @@ def update_standard_names(first_in_series: bool) -> None: "(This is used during build to automatically generate the sourcefile " "``lib/iris/std_names.py``).\n" "Latest standard names:\n" - 'wget "http://cfconventions.org/Data/cf-standard-names/current/src/cf-standard-name-table.xml";' + 'wget "https://cfconventions.org/Data/cf-standard-names/current/src/cf-standard-name-table.xml";' ) _wait_for_done(message)