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 v3p0p0 #3960

Merged
merged 25 commits into from
Jan 27, 2021
Merged

Merge back v3p0p0 #3960

merged 25 commits into from
Jan 27, 2021

Conversation

bjlittle
Copy link
Member

@bjlittle bjlittle commented Jan 26, 2021

🚀 Pull Request

Description

This PR is the merge back of the v3.0.x feature branch with the v3.0.0 release tagged.

The v3.0.x branch has already been merged back to master as part of the v3.0.0rc0 release.

This PR includes the outstanding PRs from v3.0.x to master.


Consult Iris pull request check list

bjlittle and others added 24 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
* Use Title Case Capitalisation for Documentation

* add whatsnew enter
* requirements pip to conda

* use pip install over develop

* default PY_VER to python versions
* update links

* added s to http
* drop stickler references in docs

* remove sticker from common links
* update docs for travis-ci to cirrus-ci

* add 'travis-ci' reference locally to whatsnew

* update whatsnew comment
* docs for nox

* add titles, notices and additional detail

* review actions
* test coverage for __init__ and __call__

* test coverage for metadata resolve and coverage

* partial test coverage for metadata mapping

* python 3.6 workaround for deepcopy of mock.sentinel

* test coverage for Resolve._free_mapping

* test coverage for Resolve convenience methods

* add test stub for Resolve._metadata_mapping

* fix Test__tgt_cube_position

* test coverage for shape

* test coverage for _as_compatible_cubes

* test coverage for Resolve._metadata_mapping

* test coverage for Resolve._prepare_common_dim_payload

* test coverage for Resolve._prepare_common_aux_payload

* test coverage for Resolve._prepare_points_and_bounds

* test coverage for Resolve._create_prepared_item

* test coverage for Resolve._prepare_local_payload_dim

* test coverage for Resolve._prepare_local_payload_aux

* test coverage for Resolve._prepare_local_payload_scalar + docs URL skip

* test coverage for Resolve._prepare_local_payload

* test coverage for Resolve._metadata_prepare

* added docs URL linkcheck skip

* test coverage for Resolve._prepare_factory_payload

* test coverage for Resolve._get_prepared_item

* review actions

* test coverage for Resolve.cube
@bjlittle bjlittle added New: Pull Request Type: Merge Back Merging a feature branch back to main labels Jan 26, 2021
@trexfeathers trexfeathers self-assigned this Jan 27, 2021
Copy link
Contributor

@trexfeathers trexfeathers left a comment

Choose a reason for hiding this comment

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

This merge-back includes everything I'd expect to see, and nothing unexpected, since the last merge-back (a267918).

@trexfeathers
Copy link
Contributor

I also made a conflict-resolving commit - 12ab1cb - which resulted from the changes in #3958.

@trexfeathers trexfeathers merged commit 02777db into SciTools:master Jan 27, 2021
@bjlittle
Copy link
Member Author

@trexfeathers Awesome, thanks! 👍

@bjlittle bjlittle deleted the merge-back-v3p0p0 branch January 31, 2021 17:39
tkknight added a commit to tkknight/iris that referenced this pull request Feb 1, 2021
* master:
  remove explicit URLs for core dev names from latest.rst (SciTools#3973)
  document that iris.coords.Coord is an ABC (SciTools#3971)
  reorganise docs common links + add core devs (SciTools#3972)
  Docs whatsnew add dropdowns to the template (SciTools#3969)
  Docs whatsnew enumerated lists (SciTools#3970)
  Merge back v3p0p1 (SciTools#3966)
  Captilise installation heading - align SciTools#3958 content with SciTools#3940. (SciTools#3963)
  Merge back v3p0p0 (SciTools#3960)
  Extended the installation description (SciTools#3958)
tkknight added a commit to tkknight/iris that referenced this pull request Feb 9, 2021
* master: (23 commits)
  Added text to state the Python version used to build the docs. (SciTools#3989)
  add nox session conda list (SciTools#3990)
  Add abstract cube summary (SciTools#3987)
  automate docs discovery of iris and python versions (SciTools#3981)
  corrected syntax (SciTools#3980)
  core dev whatsnew entry (SciTools#3978)
  moved docs dir and updated references to it (SciTools#3975)
  Fix test_incompatible_dimensions test (SciTools#3977)
  remove explicit URLs for core dev names from latest.rst (SciTools#3973)
  document that iris.coords.Coord is an ABC (SciTools#3971)
  reorganise docs common links + add core devs (SciTools#3972)
  Docs whatsnew add dropdowns to the template (SciTools#3969)
  Docs whatsnew enumerated lists (SciTools#3970)
  Merge back v3p0p1 (SciTools#3966)
  Captilise installation heading - align SciTools#3958 content with SciTools#3940. (SciTools#3963)
  Merge back v3p0p0 (SciTools#3960)
  Extended the installation description (SciTools#3958)
  Put cube data on the x axis if plotting just a cube against a vertical or y coordinate (SciTools#3906)
  remove stock_mdi_arrays.npz (SciTools#3913)
  Gallery: update seasonal ensemble example (SciTools#3933)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Merge Back Merging a feature branch back to main
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants