Skip to content

Conversation

trexfeathers
Copy link
Contributor

The final step of #6669

Merge via merge-commit (not squash)

trexfeathers and others added 6 commits August 21, 2025 18:13
* Protect _constraints from elementwise equality.

* Protect cube.py from elementwise equality.

* Fix dumb Constraint eq mistake.

* Protect util from elementwise equality.

* Correct return type for masked_array_equal.

* Protect _structured_array_identitication from elementwise equality.

* Fixes for saver.py

* Protect pp.py from elementwise equality.

* Protect pp_load_rules from elementwise equality.

* Revert "Protect pp.py from elementwise equality."

This reverts commit 864f0d7.

* Protect _concatenate from elementwise NOT equality.

* Protect _constraints from elementwise NOT equality.

* Protect coords.py from elementwise NOT equality.

* Protect cube.py from elementwise NOT equality.

* Protect util from elementwise NOT equality.

* Add structured array test for NumPy elementwise broadcasting error.

* Extra updates for pp_load_rules.py

* What's New entry.

* Expose users to array comparison errors when requested directly, including helpful errors.

* Back out new support for NumPy arrays in AttributeConstraint - inappropriate for patch release.

* Revert change to intersection edge_wrap - will never be comparing 2 arrays.

* Add test coverage for structured array eq with incompatible shapes.

* Test coverage for broadcasting errors in pp_load_rules.

* Common code for comparing attributes in case np arrays.

* Temporary fix for TestLicenseHeaders.

* Don't create a file when testing describe_diff.

* Final tests for attribute comparison.

* Fix any versus all confusion.

* Temporary Nox negation pin - see wntrblm/nox#961. (SciTools#6441)

---------

Co-authored-by: ukmo-ccbunney <[email protected]>
Sort-of-merge-back: `v3.12.3` into `v3.13.x`
@trexfeathers trexfeathers requested a review from bjlittle August 26, 2025 16:01
@trexfeathers trexfeathers added the Type: Merge Back Merging a feature branch back to main label Aug 26, 2025
Copy link

codecov bot commented Aug 26, 2025

Codecov Report

❌ Patch coverage is 94.87179% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 90.33%. Comparing base (9b4f9a0) to head (e3148b8).
⚠️ Report is 8 commits behind head on main.

Files with missing lines Patch % Lines
lib/iris/util.py 90.90% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6671      +/-   ##
==========================================
- Coverage   90.33%   90.33%   -0.01%     
==========================================
  Files          91       91              
  Lines       24447    24465      +18     
  Branches     4567     4568       +1     
==========================================
+ Hits        22085    22100      +15     
- Misses       1591     1597       +6     
+ Partials      771      768       -3     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@bjlittle bjlittle merged commit 951e05f into SciTools:main Aug 26, 2025
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Merge Back Merging a feature branch back to main
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants