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.

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

3.11.1.mergeback #6273

Merged
merged 12 commits into from
Dec 20, 2024
Merged

3.11.1.mergeback #6273

merged 12 commits into from
Dec 20, 2024

Conversation

ESadek-MO
Copy link
Contributor

@ESadek-MO ESadek-MO commented Dec 20, 2024

Merge the PR into main using a MERGE COMMIT (not a squash commit)

trexfeathers and others added 10 commits December 19, 2024 11:06
* PoC monkeypatch precision.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Add FUTURE flag.

* FutureWarning.

* Corrected behaviour and added tests.

* Corrected behaviour and added tests.

* What's New entry.

* Make sensitive to cf-units version.

* Further test improvements.

* Clearer FutureWarning text.

* Use a cf-units subclass instead.

* Rename _IrisUnit to Unit.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* pin dask <2024.9

* update lockfiles

* update for pypi

* add whatsnew, fix tests

* skip failing doctests
Copy link

codecov bot commented Dec 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.85%. Comparing base (a326a4c) to head (d8e545c).
Report is 13 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6273   +/-   ##
=======================================
  Coverage   89.85%   89.85%           
=======================================
  Files          88       88           
  Lines       23385    23385           
  Branches     4357     4357           
=======================================
  Hits        21012    21012           
  Misses       1646     1646           
  Partials      727      727           

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

Copy link
Member

@pp-mo pp-mo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK I think it finally makes sense to me now !
It seems a peculiarly complicated way to do it, which we never actually did before
(e.g. #6104 #5921 #5794 ).

However the actual resulting changes are exactly those (very few) you expect
And I guess the result makes a safer basis for any possible future need to merge again between the 2 branches

I think on advice of @trexfeathers ?

@pp-mo pp-mo merged commit ef1f1fe into SciTools:main Dec 20, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants