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.

Sign up for GitHub

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

Trial for public combine_cubes #83

Closed
wants to merge 10 commits into from
Closed

Trial for public combine_cubes #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9442894
replaced reference from build to python build (#6324)
ESadek-MO Feb 19, 2025
e30e623
Bump scitools/workflows from 2025.02.1 to 2025.02.2 (#6327)
dependabot[bot] Feb 20, 2025
27c3814
Move loading and combine code into their own submodules. (#6321)
pp-mo Feb 21, 2025
7e0fb16
Remove unused 'unique' option from load collections and combine methods.
pp-mo Feb 20, 2025
9096b34
Reinstate 'unique=False' in combine merges to fix load().
pp-mo Feb 20, 2025
bebeddc
Add a public 'combine_cubes'.
pp-mo Feb 20, 2025
618202a
Move CombineOptions class into iris.loading to avoid circularity.
pp-mo Feb 20, 2025
7986ffd
Docstring fixes.
pp-mo Feb 20, 2025
a598218
Various things being trialled WIP.
pp-mo Feb 21, 2025
00fae8a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ concurrency:
jobs:
manifest:
name: "check-manifest"
uses: scitools/workflows/.github/workflows/[email protected].1
uses: scitools/workflows/.github/workflows/[email protected].2
2 changes: 1 addition & 1 deletion .github/workflows/refresh-lockfiles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ on:

jobs:
refresh_lockfiles:
uses: scitools/workflows/.github/workflows/[email protected].1
uses: scitools/workflows/.github/workflows/[email protected].2
secrets: inherit
2 changes: 1 addition & 1 deletion docs/src/developers_guide/release.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ To do this perform the following steps.
Create a conda environment with the appropriate conda packages to build the
source distribution (``sdist``) and pure Python wheel (``bdist_wheel``)::

> conda create -n iris-pypi -c conda-forge --yes build twine
> conda create -n iris-pypi -c conda-forge --yes python-build twine
> . activate iris-pypi

Checkout the appropriate Iris ``<release>`` tag from the appropriate ``<repo>``.
Expand Down
7 changes: 4 additions & 3 deletions docs/src/further_topics/controlling_merge.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ demonstration, we will revert back to this legacy loading behaviour as follows:
>>> iris.LOAD_POLICY.set("legacy")

.. note::
The default settings for :data:`iris.LOAD_POLICY` effectively implements some version of the following demonstration
automatically upon loading. It may still be worth being aware of how to handle this manually if an even finer degree
of control is required.
Since Iris v3.11, the default settings for :data:`iris.LOAD_POLICY` effectively
implements some version of the following demonstration **automatically** upon
loading. It may still be worth being aware of how to handle this manually, if an
even finer degree of control is required.

How to Merge Cubes When Coordinates Differ
------------------------------------------
Expand Down
Loading