Skip to content

Commit

Permalink
Update links to https (SciTools#5621)
Browse files Browse the repository at this point in the history
* Update links to https

* Update test and docstring
  • Loading branch information
bouweandela authored Dec 11, 2023
1 parent 8694479 commit 1e1a215
Show file tree
Hide file tree
Showing 82 changed files with 170 additions and 170 deletions.
4 changes: 2 additions & 2 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ Features added

Incompatible changes
--------------------
* The Iris data model is now fully aligned with the `CF data model <http://cf-pcmdi.llnl.gov/documents/cf-conventions/>`_ .
* The Iris data model is now fully aligned with the `CF data model <https://cf-pcmdi.llnl.gov/documents/cf-conventions/>`_ .
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.
Expand Down Expand Up @@ -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 <http://matplotlib.sourceforge.net/users/whats_new.html#new-in-matplotlib-1-1>`_ . This may have a small impact on
up to `1.1.0 <https://matplotlib.sourceforge.net/users/whats_new.html#new-in-matplotlib-1-1>`_ . This may have a small impact on
some plot element placements.

Incompatible changes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ developer version or the most recent released
alt="#showyourstripes Global 1850-2021"></a>
</h4>

**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.

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions docs/gallery_code/general/plot_anomaly_log_colouring.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
"""

Expand Down Expand Up @@ -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.
Expand Down
18 changes: 9 additions & 9 deletions docs/src/IEP/IEP001.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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])`
Expand All @@ -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
18 changes: 9 additions & 9 deletions docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand Down
2 changes: 1 addition & 1 deletion docs/src/copyright.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.nationalarchives.gov.uk/doc/open-government-licence>`_.
`Open Government Licence <https://www.nationalarchives.gov.uk/doc/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
Expand Down
2 changes: 1 addition & 1 deletion docs/src/developers_guide/contributing_deprecations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://semver.org/>`_.
`major release <https://semver.org/>`_.


Adding a Deprecation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions docs/src/developers_guide/documenting/rest_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://example.com>`_``
which will look like `Text of the link <http://example.com>`_
Basic links can be created with ```Text of the link <https://example.com>`_``
which will look like `Text of the link <https://example.com>`_


Documents in the same project can be cross referenced with the syntax
Expand All @@ -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
2 changes: 1 addition & 1 deletion docs/src/developers_guide/gitwash/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions docs/src/developers_guide/gitwash/git_links.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]/msg39091.html
.. _linux git workflow: https://www.mail-archive.com/[email protected]/msg39091.html

.. |emdash| unicode:: U+02014
2 changes: 1 addition & 1 deletion docs/src/developers_guide/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion docs/src/further_topics/ugrid/data_model.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions docs/src/further_topics/um_files_loading.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://cfconventions.org/>`_, so most of this can
`NetCDF CF conventions <https://cfconventions.org/>`_, 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 <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
---------------------------
Expand Down Expand Up @@ -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 <http://www.unidata.ucar.edu/software/udunits/>`_.
`UDUNITS project <https://www.unidata.ucar.edu/software/udunits/>`_.
These values are stored as cube coordinates, where the scaling and calendar
information is contained in the :attr:`~iris.coords.Coord.units` property.

Expand Down
2 changes: 1 addition & 1 deletion docs/src/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://cfconventions.org>`_
Iris implements a data model based on the `CF conventions <https://cfconventions.org>`_
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.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/userguide/cube_maths.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html>`_, but
`NumPy <https://docs.scipy.org/doc/numpy/user/basics.broadcasting.html>`_, but
the additional richness of Iris coordinate meta-data provides an enhanced
capability beyond the basic broadcasting behaviour of NumPy.

Expand Down
4 changes: 2 additions & 2 deletions docs/src/userguide/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Glossary
This also forms the data model which iris is based on.

| **Related:** :term:`NetCDF Format`
| **More information:** `CF Conventions <http://cfconventions.org/>`_
| **More information:** `CF Conventions <https://cfconventions.org/>`_
|
Coordinate
Expand Down Expand Up @@ -188,7 +188,7 @@ Glossary
Standard Name
A name describing a :term:`phenomenon`, one from a fixed list
defined at `CF Standard Names <http://cfconventions.org/standard-names.html>`_.
defined at `CF Standard Names <https://cfconventions.org/standard-names.html>`_.

| **Related:** :term:`Long Name` **|** :term:`Cube`
| **More information:** :doc:`iris_cubes`
Expand Down
6 changes: 3 additions & 3 deletions docs/src/userguide/plotting_a_cube.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
`<http://effbot.org/pyfaq/tutor-what-is-if-name-main-for.htm>`_.
`<https://effbot.org/pyfaq/tutor-what-is-if-name-main-for.htm>`_.

In order to run this example, you will need to copy the code into a file
and run it using ``python my_file.py``.
Expand Down Expand Up @@ -285,15 +285,15 @@ 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
CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.

To include a reference in a journal article or report please refer to
`section 5 <http://www.personal.psu.edu/cab38/ColorBrewer/ColorBrewer_updates.html>`_
`section 5 <https://www.personal.psu.edu/cab38/ColorBrewer/ColorBrewer_updates.html>`_
in the citation guidance provided by Cynthia Brewer.

For adding citations to Iris plots, see :ref:`brewer-cite` (below).
Expand Down
2 changes: 1 addition & 1 deletion docs/src/userguide/real_and_lazy_data.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://dask.pydata.org/en/latest/scheduler-overview.html>`_
`dask documentation <https://dask.pydata.org/en/latest/scheduler-overview.html>`_
for more information on setting dask processing options.


Expand Down
8 changes: 4 additions & 4 deletions docs/src/whatsnew/1.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.ordnancesurvey.co.uk/>`_.
`Ordnance Survey <https://www.ordnancesurvey.co.uk/>`_.


.. _whats-new-cartopy:
Expand All @@ -92,7 +92,7 @@ Using Cartopy for Mapping in Matplotlib
---------------------------------------

The underlying map drawing package has now been updated to use
`Cartopy <http://scitools.github.com/cartopy>`_. Cartopy provides a
`Cartopy <https://scitools.github.com/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.
Expand Down Expand Up @@ -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 <http://scitools.github.com/cartopy>`_.
`Cartopy's documentation <https://scitools.github.com/cartopy>`_.


Hybrid-Pressure
Expand Down Expand Up @@ -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 <http://www.personal.psu.edu/cab38/ColorBrewer/ColorBrewer_updates.html>`_
`section 5 <https://www.personal.psu.edu/cab38/ColorBrewer/ColorBrewer_updates.html>`_
in the citation guidance provided by Cynthia Brewer.


Expand Down
2 changes: 1 addition & 1 deletion docs/src/whatsnew/1.13.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/src/whatsnew/1.4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/whatsnew/1.6.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://docs.python.org/2/reference/datamodel.html#context-managers>`_
`context manager <https://docs.python.org/2/reference/datamodel.html#context-managers>`_
which allows multiple sections of code to execute with different run-time
behaviour.

Expand Down
4 changes: 2 additions & 2 deletions docs/src/whatsnew/2.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit 1e1a215

Please sign in to comment.