Mergeback v3.3.1 #5004
Merged
Mergeback v3.3.1 #5004
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Test the calls implementing Cube and Cubelist printing, and repr_html(). * Reinstate CubeList._repr_html_() method. * Review changes. * Add whatsnew. * Typo in whatsnew. * Update docs/src/whatsnew/3.3.rst Co-authored-by: lbdreyer <[email protected]> Co-authored-by: lbdreyer <[email protected]>
* Fix name loader problem; enforce expected type of all cube cell_methods. * Review change: fix import order. * Update imagerepo.json for skipped changes from test-iris-imagehash v0.16.
* Lockfile updates (SciTools#4968) * Updated environment lockfiles * Adjustments for Cartopy v0.21.0 (SciTools/cartopy@fcb784d). * Cartopy >=0.21 pin. * What's New entry. * WIP try netCDF4 pin. * Try pip installing netcdf4==1.6.1 as requested by @ocefpaf. * Revert "Try pip installing netcdf4==1.6.1 as requested by @ocefpaf." This reverts commit ce9f890. * netcdf4!=1.6.1 * Align Conda YAML formatting. Co-authored-by: Lockfile bot <[email protected]> * New lockfiles. * What's New entry. * What's New correction. Co-authored-by: Lockfile bot <[email protected]>
* set whatsnew release date * fix whatsnew
* v3.3.x: Update whatsnew for 3.3.1 release (SciTools#5002) Port dependency fixes to `v3.3.x`. (SciTools#4992) Fix name loader problem (SciTools#4933) Reinstate CubeList._repr_html_() (SciTools#4976) # Conflicts: # .github/workflows/ci-tests.yml # requirements/ci/nox.lock/py310-linux-64.lock # requirements/ci/nox.lock/py38-linux-64.lock # requirements/ci/nox.lock/py39-linux-64.lock # requirements/ci/py310.yml # requirements/ci/py38.yml # requirements/ci/py39.yml # setup.cfg
trexfeathers
approved these changes
Sep 29, 2022
Contributor
trexfeathers
left a comment
trexfeathers
left a comment
There was a problem hiding this comment.
This has everything I expected to see, and nothing I didn't.
Impressive resolution of possible conflicts, too!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🚀 Pull Request
Description
Merge the 3.3.x branch back into main after the release of 3.3.1.
Note: to be merged without squashing!
Consult Iris pull request check list