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

Fix for xarray 2024.09.0 #1920

Merged
merged 9 commits into from
Sep 16, 2024
Merged

Fix for xarray 2024.09.0 #1920

merged 9 commits into from
Sep 16, 2024

Conversation

aulemahal
Copy link
Collaborator

Well, this could have been expected from my decision to use a private function that I myself removed... But I had forgotten that we were explicitly using it.

So this fixes xclim with xarray 2024.09.0 by having a try-except for the import of the decimal year stuff.

Also, removed the deprecated function.

As of xarray 2024.09, the "decimal year" can be calculated through times.dt.decimal_year, no need to use a private function.

Copy link
Collaborator

@Zeitsperre Zeitsperre left a comment

Choose a reason for hiding this comment

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

Sounds good, but we need to make a new release, unfortunately.

@github-actions github-actions bot added the approved Approved for additional tests label Sep 13, 2024
@aulemahal aulemahal changed the base branch from v0.52.1 to main September 13, 2024 14:51
@aulemahal
Copy link
Collaborator Author

I'll let you decide how to manage the git stuff 😅

Copy link
Collaborator

@Zeitsperre Zeitsperre left a comment

Choose a reason for hiding this comment

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

OK, we're going to need to rebase this PR onto the v0.52.1 tag, if that's alright. If you want to do the following, this would be helpful:

  1. Start a new branch based on the v0.52.1 tag (v0.52.2).
  2. git cherry-pick your commits to the new branch.
  3. Open a PR and do not merge main into it

I can take things from there.

Scratch all of that. Working from here, see if you can get things working. There should be exactly two failing tests in all builds at the moment. I'll mark.xfail them here (they're removed in main) so that we can verify there aren't slower builds failing with unexpected failures.

@Zeitsperre Zeitsperre changed the base branch from main to v0.52.1 September 13, 2024 15:39
@Zeitsperre Zeitsperre changed the base branch from v0.52.1 to main September 13, 2024 15:39
@Zeitsperre Zeitsperre changed the base branch from main to v0.52.1 September 13, 2024 15:45
@aulemahal
Copy link
Collaborator Author

There's a bug with intersphinx for statsmodel, maybe just a retry could solve it ?

And the notebook CI doesn't seem aware that it should use the old version of xclim-testdata...

Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@github-actions github-actions bot added the docs Improvements to documenation label Sep 16, 2024
@Zeitsperre Zeitsperre merged commit 1456127 into v0.52.1 Sep 16, 2024
18 of 19 checks passed
@Zeitsperre Zeitsperre deleted the fix-xr-decimalyr branch September 16, 2024 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Approved for additional tests docs Improvements to documenation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants