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

Jump to bottom

Added more descriptive errors within concatenate #6005

Merged
merged 5 commits into from
Jun 14, 2024
Merged

Added more descriptive errors within concatenate #6005

merged 5 commits into from
Jun 14, 2024

Conversation

ESadek-MO
Copy link
Contributor

Closes #5683.

@codecov Codecov
Copy link

codecov bot commented Jun 14, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.78%. Comparing base (e92e36a) to head (6cc2c5c).
Report is 66 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #6005      +/-   ##
==========================================
+ Coverage   89.75%   89.78%   +0.03%     
==========================================
  Files          90       90              
  Lines       22929    22938       +9     
  Branches     5020     5023       +3     
==========================================
+ Hits        20580    20595      +15     
+ Misses       1618     1612       -6     
  Partials      731      731

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

trexfeathers
trexfeathers requested changes Jun 14, 2024
View reviewed changes
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.

Nice work, and glad to see @rcomer likes it too!

Some comments for you

docs/src/whatsnew/latest.rst Outdated Show resolved Hide resolved
lib/iris/_concatenate.py Outdated Show resolved Hide resolved
lib/iris/_concatenate.py Outdated Show resolved Hide resolved
lib/iris/_concatenate.py Outdated Show resolved Hide resolved
lib/iris/tests/unit/concatenate/test_concatenate.py Outdated Show resolved Hide resolved
lib/iris/_concatenate.py Outdated Show resolved Hide resolved
lib/iris/_concatenate.py Show resolved Hide resolved
@trexfeathers trexfeathers enabled auto-merge (squash) June 14, 2024 13:53
@trexfeathers trexfeathers merged commit 998a568 into SciTools:main Jun 14, 2024
21 checks passed
tkknight added a commit to tkknight/iris that referenced this pull request Jun 20, 2024
@tkknight
Merge remote-tracking branch 'upstream/main' into retire_napolean
ec6e2b5 
* upstream/main: (42 commits)
  Mesh saveload fix (SciTools#6004)
  used tabs for the install info (SciTools#6013)
  Fix array_equal behaviour for masked arrays (SciTools#4457)
  Bump scitools/workflows from 2024.06.1 to 2024.06.2 (SciTools#6008)
  [pre-commit.ci] pre-commit autoupdate (SciTools#6007)
  Updated environment lockfiles (SciTools#5996)
  Added more descriptive errors within concatenate (SciTools#6005)
  Bump scitools/workflows from 2024.06.0 to 2024.06.1 (SciTools#5998)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5997)
  Bump scitools/workflows from 2024.05.1 to 2024.06.0 (SciTools#5986)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5980)
  Updated environment lockfiles (SciTools#5983)
  Bump scitools/workflows from 2024.05.0 to 2024.05.1 (SciTools#5984)
  Make `slices_over` tests go faster (SciTools#5973)
  Updated environment lockfiles (SciTools#5979)
  Update lock files with associated fixes (SciTools#5953)
  List 25 slowest tests (SciTools#5969)
  used a note to highlight some text (SciTools#5971)
  Lazy `iris.cube.Cube.rolling_window` (SciTools#5795)
  Add memory benchmarks (SciTools#5960)
  ...
tkknight added a commit to tkknight/iris that referenced this pull request Jun 23, 2024
@tkknight
Merge remote-tracking branch 'upstream/main' into autoapi
afbd003 
* upstream/main: (143 commits)
  Updated environment lockfiles (SciTools#6020)
  Add `MeshCoord.collapsed` (SciTools#6003)
  Bump scitools/workflows from 2024.06.2 to 2024.06.3 (SciTools#6015)
  Mesh saveload fix (SciTools#6004)
  used tabs for the install info (SciTools#6013)
  Fix array_equal behaviour for masked arrays (SciTools#4457)
  Bump scitools/workflows from 2024.06.1 to 2024.06.2 (SciTools#6008)
  [pre-commit.ci] pre-commit autoupdate (SciTools#6007)
  Updated environment lockfiles (SciTools#5996)
  Added more descriptive errors within concatenate (SciTools#6005)
  Bump scitools/workflows from 2024.06.0 to 2024.06.1 (SciTools#5998)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5997)
  Bump scitools/workflows from 2024.05.1 to 2024.06.0 (SciTools#5986)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5980)
  Updated environment lockfiles (SciTools#5983)
  Bump scitools/workflows from 2024.05.0 to 2024.05.1 (SciTools#5984)
  Make `slices_over` tests go faster (SciTools#5973)
  Updated environment lockfiles (SciTools#5979)
  Update lock files with associated fixes (SciTools#5953)
  List 25 slowest tests (SciTools#5969)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trexfeathers trexfeathers trexfeathers approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Include helpful error if non-identical meshes have prevented concatenation or merging
2 participants
@ESadek-MO @trexfeathers