Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge back v3.0.x #3930

Merged
merged 13 commits into from
Nov 25, 2020
Merged

Merge back v3.0.x #3930

merged 13 commits into from
Nov 25, 2020

Conversation

bjlittle
Copy link
Member

🚀 Pull Request

Description

This PR merges back the contents of the v3.0.x release branch to master.


Consult Iris pull request check list

bjlittle and others added 13 commits October 2, 2020 10:36
* Add release highlights and pin rc version

* review actions
* Add failing test of plotting

* Implement fix to pass test

* Update idiff to ignore irrelevant hyphens in path

* Update imagerepo (following docs)

* Update after review by @trexfeathers

* Add whatsnew entries

* Move whatsnew entries into correct file
* Minor phrasing change in 'Release candidate'.

* Before release deprecations.

* Whatsnew highlights section.
* Updated CF saver version in User Guide and docstring

* Remove references to CF version of the loader in docstrings

* Added whatsnew

* Pin cftime<1.3.0
* migrate from travis-ci to cirrus-ci

* added whatsnew entries
@bjlittle bjlittle added this to the v3.1.0 milestone Nov 25, 2020
@tkknight tkknight self-assigned this Nov 25, 2020
@tkknight
Copy link
Contributor

Great, thanks @bjlittle

Copy link
Contributor

@tkknight tkknight left a comment

Choose a reason for hiding this comment

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

Looks good.

@bjlittle bjlittle closed this Nov 25, 2020
@bjlittle bjlittle reopened this Nov 25, 2020
@tkknight tkknight merged commit a267918 into SciTools:master Nov 25, 2020
@bjlittle bjlittle deleted the merge-back-v3p0px branch January 31, 2021 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants