Merge-forward to FEATURE_split_attrs #5164
Merged
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 (#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]>
* Change deprecated MPL colormap registration - matplotlib/matplotlib#23668. * Adapt benchmark for importing palette to cope with MPL 3.6. * What's New entry. * What's New typo. * Reformat import_iris imports.
* set whatsnew release date * fix whatsnew
* v3.3.x: Update whatsnew for 3.3.1 release (#5002) Port dependency fixes to `v3.3.x`. (#4992) Fix name loader problem (#4933) Reinstate CubeList._repr_html_() (#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
Mergeback v3.3.1
…nates (#4969) * Convert all time points at once before generating cells * Small simplification * Add a whatnew entry * Fix link Co-authored-by: Martin Yeo <[email protected]> Co-authored-by: Martin Yeo <[email protected]>
Co-authored-by: Lockfile bot <[email protected]>
Instead of Python-Glossary
* DOC: add show option to Makefiles * fix typo Co-authored-by: Patrick Peglar <[email protected]> Co-authored-by: Patrick Peglar <[email protected]>
* Sample code to convert ORCA data into a meshcube. * Better illustrative image. * Added whatsnew.
* New LBFC-CF mappings based on info from Julian Heming. * Further mappings. * What's New entry.
* remove ancient workarounds * whatsnew
Co-authored-by: Lockfile bot <[email protected]>
* Speed up Cube.subset/Coord.intersect * Add a whatsnew entry
updates: - [github.com/psf/black: 22.8.0 → 22.10.0](psf/black@22.8.0...22.10.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.1.3 to 4.2.0. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](peter-evans/create-pull-request@671dc9c...b4d5173) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Meshcoords take metadata from face/edge coords. * Test fixes. * Added tests for missing-vs-present standard-names and units. * Slight code tidying. * Review changes. * Added whatsnew.
* Added pandas_ndim FUTURE flag. * TODO flag to document pandas_ndim future flag.
* Added in dim_coord prioritisation within _get_lon_lat_coords * Completed testing for dim coord prioritisation, added what's new entry * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * updated tests to include fixtures * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Mostly formatting changes for readability, largely suggested by Payton for better PyTest consistency. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Replaced with throughout * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * updated docstring in project Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* improve error messages * whitespace fix * edit/fix error messages * add whatsnew entry * Apply suggestions from code review Co-authored-by: Ruth Comer <[email protected]> * add test Co-authored-by: Ruth Comer <[email protected]>
* Use reusable workflow for refresh lockfile workflow * Update location of reusable workflows
* Replicate legacy dask behaviour pre dask/dask#9555. * Revert "Replicate legacy dask behaviour pre dask/dask#9555." This reverts commit 7363412. * Accept shared NumPy arrays when copying certain Dask arrays - dask/dask#9555. * Updated lock-files. * What's New entry. * Re-arrange What's New entry.
Co-authored-by: Lockfile bot <[email protected]>
Co-authored-by: Lockfile bot <[email protected]>
updates: - [github.com/psf/black: 22.10.0 → 22.12.0](psf/black@22.10.0...22.12.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* remove test timings * whatsnew * missed a bit * review action
* Correct heading for v3.4 release highlights. * Include patch number in release highlights heading. Co-authored-by: lbdreyer <[email protected]> Co-authored-by: lbdreyer <[email protected]>
updates: - [github.com/pycqa/isort: 5.10.1 → v5.11.3](PyCQA/isort@5.10.1...v5.11.3) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Bumps [actions/stale](https://github.com/actions/stale) from 6 to 7. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](actions/stale@v6...v7) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
updates: - [github.com/pycqa/isort: v5.11.3 → 5.11.4](PyCQA/isort@v5.11.3...5.11.4) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* unpin theme and set default style to light (not dark) * added whatsnew and fixed typo. * minor tweaks
* remove spelling config and docs, this didnt pan out. * added line break
* Fix link checks. * What's New entry. * ECMWF about experiment. * ECMWF apps experiment. * Remove ECMWF link. * More specific What's New entry.
* Updated environment lockfiles * Use set_ylim for test_2d_coord_bounds_platecarree. * Don't use np.float for maths tests. * Remove uses of np.int . Co-authored-by: Lockfile bot <[email protected]>
* Updated citation * Added WhatsNew * Reference version 3.4 in DOI Co-authored-by: Bouwe Andela <[email protected]> * Suggest updating the citation at every release Co-authored-by: Bouwe Andela <[email protected]>
* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/asottile/blacken-docs: v1.12.1 → 1.13.0](adamchainz/blacken-docs@v1.12.1...1.13.0) * Remove explicit black version dependency from blacken-docs. Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Martin Yeo <[email protected]>
* Iris Xarray docs page. * Add links. * Xarray page styling. * What's New entry. * Minor docs fixes. * Overall experience section. * Xarray supports other plotting backends through external packages. Co-authored-by: Deepak Cherian <[email protected]> * Section on converting between Iris and Xarray. * Clearer language around laziness and multi-processing. * To-do note about dates and fill values. * Move iris_xarray page into a new Community section. * Language fixes from @bjlittle review. Co-authored-by: Deepak Cherian <[email protected]>
updates: - [github.com/pycqa/isort: 5.11.4 → 5.12.0](PyCQA/isort@5.11.4...5.12.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* add readme #showyourstripes * use defacto url src * update whatsnew * licensed to distributed
* Fixing typo's in Gitwash. * Updating the whatsnew to implement requested changes
* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/psf/black: 22.12.0 → 23.1.0](psf/black@22.12.0...23.1.0) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Set up `iris.plugins` namespace package * Provide convenience function to use a plugin * Basic documentation for plugins * Add a hint about plugins when load fails * Expose `use_plugin` in `__all__` * Add example usage * Split plugin documentation to its own page * Document how to create a plugin * Link to documentation * Correct "plain" code block -> "text" * Whatsnew
Co-authored-by: Lockfile bot <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Keep the feature-branch branch alive with CI working.