Skip to content

Conversation

@lbdreyer
Copy link
Member

@lbdreyer lbdreyer commented Oct 7, 2019

Now release candidate is cut, this PR is intended to mergeback the changes (as of yet) in the v2.3.x branch onto master.

This includes removing the docs/iris/src/whatsnew/contributions_2.3.0 directory and replaces it with the 2.3.rst

This requires being followed up by a PR that includes a docs/iris/src/whatsnew/contributions_3.0.0 directory

stephenworsley and others added 3 commits October 7, 2019 15:50
Additional whatsnew contributions for v2.3 release.
* Manual elements of What's New

* renamed manual 2.3 What's New entries

* Created 2.3 What's New document.

* Referencing 2.3 What's New in index.html

* Explicit reference to 2.3.0

* Added separator underneath showcases

* Deleted contributions folder.

* Referenced CF conventions for NetCDF format example

* Moved CF 1.7 support from bugfix to new feature.

* Typo in Cube.collapsed.

* Underlines, code-block language and CF terminology fixes.

* Correction to climatological docstring and What's New.

* Correction to climatological docstring and What's New.

* Added Geostationary projection to CF 1.7 showcase.

* Chunking strategy phrasing.

* CubeList link for render HTML point.

* Removed reference to latest.rst from What's New index.

* CF 1.7 section links.

* Removed duplicate note about realisation with iris.analysis.RMS

* Improved formatting for cube equality point.

* Fixed Dask dependency to by >=1.2.

* Proj4 dependency phrasing.

* with masked arrays -> with arrays with missing points.

* var_name name token phrasing.

* Removed reference to private method Cube._html_repr_.

* abf/abl cube pluralisation.

* Link for NEMO example.

* Corrected internal documentation links.

* Corrected *integer* value support.

* Geostationary includes load and save support.

* Clarified self-referencing NetCDF variables.

* Reworded CF 1.7 showcase.

* Internal address fixes.

* Removed name tokens from the CF 1.7 showcase.
@lbdreyer lbdreyer added this to the v3.0.0 milestone Oct 7, 2019
@lbdreyer
Copy link
Member Author

lbdreyer commented Oct 7, 2019

Note the SHAs are different!
I wasn't sure how to do this in a way that also keeps the SHAs, since they are based on the parent commit which differs between master and v2.3.x (which each had PR to change the version string)

@bjlittle bjlittle merged commit c892fa7 into SciTools:master Oct 8, 2019
@lbdreyer lbdreyer deleted the mergebackv2.3_1 branch June 23, 2021 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants