Sort-of-merge-back: v3.12.3 into v3.13.x
#6669
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
* 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]>
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## v3.13.x #6669 +/- ##
===========================================
- Coverage 90.02% 89.93% -0.10%
===========================================
Files 91 91
Lines 24783 24411 -372
Branches 4710 4555 -155
===========================================
- Hits 22312 21953 -359
+ Misses 1700 1692 -8
+ Partials 771 766 -5 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
bjlittle
approved these changes
Aug 26, 2025
There was a problem hiding this comment.
@trexfeathers Nice one 🥳
Confirmed this sort-of-merge-back™️ is a combination of PRs #6665 and #6668 (v3.12.x).
So playing forward the v3.12.3 patch onto v3.13.x 👍
|
Thanks @bjlittle! |
Merged
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.
v3.12has been patched:v3.12.3. This patch should be propagated tov3.13.x, and also tomain.I created this branch using:
By propagating to
v3.13.xfirst, we should be able to preserve the original commits and avoid the inevitable merge conflicts that come when usinggit cherry-pick1. Sincev3.12.xandv3.13.xshare a common history, you can see that the only difference is the one we want - the commits from the new patch.Once the patch release of
v3.13is complete, we can then finish with a normal merge-back fromv3.13.xtomain.Merge via a merge commit (not squash)
Footnotes
the alternative: standard merge-back
v3.12.xintomain. How to then add the desired patch tov3.13.x? Must not mergemaininto3.13.xsincemainincludes many other commits that occurred post-3.13-release. Only remaining option is tocherry-pick, which gives the commit(s) new SHA(s), and they conflict whenv3.13.xis merged-back intomain. ↩