Skip to content

Commit

Permalink
rebase latest changes
Browse files Browse the repository at this point in the history
  • Loading branch information
bjlittle committed Jan 28, 2022
1 parent e1df351 commit 46595e1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 362 deletions.
14 changes: 9 additions & 5 deletions docs/src/whatsnew/dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ This document explains the changes made to Iris for this release
and attached to a cube.
* We've also dropped support for ``Python 3.7``.

And finally, get in touch with us on `GitHub`_ if you have any issues or
feature requests for improving Iris. Enjoy!
And finally, get in touch with us on :issue:`GitHub<new/choose>` if you have
any issues or feature requests for improving Iris. Enjoy!


📢 Announcements
Expand Down Expand Up @@ -220,6 +220,11 @@ This document explains the changes made to Iris for this release
``as_compatible_shape(src_cube, target_cube)`` replace with
``Resolve(src_cube, target_cube)(target_cube.core_data())``. (:pull:`4513`)

#. `@wjbenfold`_ deprecated :func:`iris.analysis.maths.intersection_of_cubes` in
preference for :meth:`iris.cube.CubeList.extract_overlapping`. The
:func:`~iris.analysis.maths.intersection_of_cubes` function will be removed in
a future release of Iris. (:pull:`4541`)


🔗 Dependencies
===============
Expand Down Expand Up @@ -320,8 +325,8 @@ This document explains the changes made to Iris for this release

#. `@lbdreyer`_ corrected the license PyPI classifier. (:pull:`4435`)

#. `@aaronspring <https://github.com/aaronspring>`_ exchanged `dask` with
`dask-core` in testing environments reducing the number of dependencies
#. `@aaronspring <https://github.com/aaronspring>`_ exchanged ``dask`` with
``dask-core`` in testing environments reducing the number of dependencies
installed for testing. (:pull:`4434`)

#. `@wjbenfold`_ prevented github action runs in forks (:issue:`4441`,
Expand All @@ -345,7 +350,6 @@ This document explains the changes made to Iris for this release
.. comment
Whatsnew resources in alphabetical order:
.. _GitHub: https://github.com/SciTools/iris/issues/new/choose
.. _NEP-29: https://numpy.org/neps/nep-0029-deprecation_policy.html
.. _UGRID: http://ugrid-conventions.github.io/ugrid-conventions/
.. _sort-all: https://github.com/aio-libs/sort-all
Expand Down
357 changes: 0 additions & 357 deletions docs/src/whatsnew/latest.rst

This file was deleted.

Loading

0 comments on commit 46595e1

Please sign in to comment.