Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docs/iris/src/userguide/regridding_plots/regridding_plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,4 @@
ax.coastlines(resolution="50m")
ax.gridlines()

plt.tight_layout()

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tkknight The plt.tight_layout() was causing a traceback within matplotlib, resulting in the plot not being rendered in the documentation i.e., see here.

plt.show()
25 changes: 14 additions & 11 deletions docs/iris/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ Features
associated with an axis over which the statistic is being run.

* Supporting ``Iris`` for both ``Python2`` and ``Python3`` resulted in pinning our
dependency on `matplotlib`_ at ``v2.x``. Now that ``Python2`` support has
been dropped, ``Iris`` is free to use the latest version of `matplotlib`_.
dependency on `Matplotlib`_ at ``v2.x``. Now that ``Python2`` support has
been dropped, ``Iris`` is free to use the latest version of `Matplotlib`_.

* `CF Ancillary Data`_ variables are now supported, and can be loaded from and
saved to NetCDF-CF files. Support for `Quality Flags`_ is also provided to
Expand All @@ -35,16 +35,17 @@ Features
Dependency Updates
==================

* Iris now supports the latest version of
`Proj <https://github.com/OSGeo/PROJ>`_.
* Iris now supports the latest version of `Proj <https://github.com/OSGeo/PROJ>`_.

* Iris now requires `Cartopy <https://github.com/SciTools/cartopy>`_ >= 0.18 in
order to remain compatible with the latest version of
`Matplotlib <https://github.com/matplotlib/matplotlib>`_.
order to remain compatible with the latest version of `Matplotlib`_.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tkknight There ended up being two matplotlib references...


* GDAL is removed from the extensions dependency group. We no longer consider it to
be an extension.

* Configuring Iris and :ref:`installing_from_source` as a developer, with all the
required package dependencies is now easier with our curated conda environment
YAML files. See :pull:`3812`.

Bugs Fixed
==========
Expand Down Expand Up @@ -125,10 +126,13 @@ Internal
========

* Changed the numerical values in tests involving the Robinson projection due
to improvements made in `Proj <https://github.com/OSGeo/PROJ>`_ (see `proj#1292 <https://github.com/OSGeo/PROJ/pull/1292>`_ and `proj#2151 <https://github.com/OSGeo/PROJ/pull/2151>`_).
to improvements made in `Proj <https://github.com/OSGeo/PROJ>`_ (see
`proj#1292 <https://github.com/OSGeo/PROJ/pull/1292>`_ and
`proj#2151 <https://github.com/OSGeo/PROJ/pull/2151>`_).

* Change tests to account for more detailed descriptions of projections in
`GDAL <https://github.com/OSGeo/gdal>`_ (`see GDAL#1185 <https://github.com/OSGeo/gdal/pull/1185>`_).
`GDAL <https://github.com/OSGeo/gdal>`_
(`see GDAL#1185 <https://github.com/OSGeo/gdal/pull/1185>`_).

* Change tests to account for `GDAL <https://github.com/OSGeo/gdal>`_ now
saving fill values for data without masked points.
Expand All @@ -144,8 +148,7 @@ Internal
<https://github.com/SciTools/cartopy/pull/1117>`_).

* Additional acceptable graphics test targets to account for very minor changes
in `Matplotlib <https://github.com/matplotlib/matplotlib>`_ version 3.3
(colormaps, fonts and axes borders).
in `Matplotlib`_ version 3.3 (colormaps, fonts and axes borders).


Deprecations
Expand Down Expand Up @@ -192,6 +195,6 @@ Documentation
clarify how ``Units`` are handled during cube arithmetic.

.. _Read the Docs: https://scitools-iris.readthedocs.io/en/latest/
.. _matplotlib: https://matplotlib.org/
.. _Matplotlib: https://matplotlib.org/
.. _CF Ancillary Data: https://cfconventions.org/Data/cf-conventions/cf-conventions-1.8/cf-conventions.html#ancillary-data
.. _Quality Flags: https://cfconventions.org/Data/cf-conventions/cf-conventions-1.8/cf-conventions.html#flags
2 changes: 1 addition & 1 deletion lib/iris/common/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,7 @@ def _check(item):

class DimCoordMetadata(CoordMetadata):
"""
Metadata container for a :class:`~iris.coords.DimCoord"
Metadata container for a :class:`~iris.coords.DimCoord`
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tkknight This was just wrong, and causing a documentation warning during sphinx build time.


"""

Expand Down