Merge master to mesh data model#4093
Merged
trexfeathers merged 44 commits intoSciTools:mesh-data-modelfrom Apr 9, 2021
Merged
Conversation
Co-authored-by: stephen.worsley <stephen.worsley@metoffice.gov.uk>
…ols#3989) * Added text to state the Python version used to build the docs. * Added footer template that includes the Python version used to build. * added new line * Review actions * added whatsnew
* support for py38 * update CI and noxfile * enforce alphabetical xml element attribute order * full tests for py38 + fix docs-tests * add whatsnew entry * update doc-strings + review actions * Alternate xml handling routine (#29) * all xml tests pass for nox tests-3.8 * restored docstrings * move sort_xml_attrs * make sort_xml_attrs a classmethod * update sort_xml_attr doc-string Co-authored-by: Bill Little <bill.james.little@gmail.com> * add jamesp to whatsnew + minor tweak Co-authored-by: James Penn <james@jamespenn.co.uk>
* update cop maps example * comment tweaks * minor comment tweak + whatsnew * reinstate whatsnew addition * remove duplicate whatsnew
* Extra tests; fix for array attributes. * Docstring for CubeSummary, and remove some unused parts. * Fix section name capitalisation, in line with existing cube summary. * Handle array differences; quote strings in extras and if 'awkward'-printing. * Ensure scalar string coord 'content' prints on one line.
* update intersphinx mapping and matplotlib urls * use matplotlib intersphinx where possible * review actions * review actions
* update readme badges * pimp twitter badge
* Stopped using deprecated aliases of builtin types. This is required to avoid warnings starting with NumPy 1.20.0. * Update lib/iris/tests/test_cell.py Co-authored-by: Bill Little <bill.little@metoffice.gov.uk> * Update lib/iris/tests/test_cell.py Co-authored-by: Bill Little <bill.little@metoffice.gov.uk> * Updated whatsnew. Co-authored-by: Bill Little <bill.little@metoffice.gov.uk>
* baseline * removed debug comments * reverted * remove line * Testing * testing extensions * testing rtd_version * fixed if * removed line * tidy up * tidy comments * debug of pre-existing rtd variables * added reminder * testing * testing still * updated comments * added whatsnew * expanded the if conditiion * review actions * Update layout.html Remove alternative banner that used the RestructuredText notation. * review actions
* cirrus-ci conditional tasks * use bc for bash arithmetic * revert back to sed * use expr * reword * minor documentation changes * review actions
* implement metadata string * review actions
* add pre-commit.ci badge and doc support * review actions
* add github discussions badge * rationalise badges * lower case text
* added stable docs links. * changed layout * updated layout * tdy up html tags
* fix mpl SymLogNorm * update graphics tests phashes * add whatsnew entries * gallery image phash update
bjlittle
force-pushed
the
merge-master-to-mesh-data-model
branch
from
776ffbc to
8f6bb44
Compare
trexfeathers
approved these changes
Apr 9, 2021
Contributor
trexfeathers
left a comment
trexfeathers
left a comment
There was a problem hiding this comment.
This PR has every expected commit since branch creation, and no unexpected commits (the only extra one being the conflict-resolving 8f6bb44).
The diff matches this comparison of master's state at the last merge-back (#4022) with the final master commit in this PR.
Contributor
|
Confident that the CI delays will not be masking any failures, and low risk given this is a feature branch. Merging now. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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
This PR merges the latest changes from
masterto themesh-data-modelfeature branch.Consult Iris pull request check list