xclim 0.48 compatibility #351

RondeauG · 2024-02-21T20:17:20Z

Pull Request Checklist:

This PR addresses an already opened issue (for bug fixes / features)
- No
(If applicable) Documentation has been added / updated (for bug fixes / features).
(If applicable) Tests have been added.
This PR does not seem to break the templates.
CHANGES.rst has been updated (with summary of main changes).
- Link to issue (:issue:number) and pull request (:pull:number) has been added.
Maybe... Add a workaround to convert the old xrfreq nomenclature to the new one upon loading an existing catalog or parsing a directory.

What kind of change does this PR introduce?

Changes to be compatible with recent versions of pandas/xarray/xclim

Does this PR introduce a breaking change?

xscen now requires pandas >= 2.2
Functions that output a dict with keys as xrfreq (extract_dataset, compute_indicators) will now return the new nomenclature.
The frequency --> xrfreq/timedelta will now only result in the new nomenclature for hours (lower case h).

Other information:

environment-dev.yml

environment.yml

pyproject.toml

RondeauG · 2024-02-22T14:23:28Z

Let's wait for Ouranosinc/xclim#1664 before we finish this PR.

Zeitsperre · 2024-02-22T16:37:13Z

The problem with Python3.12 is quite silly. Pushing a fix in a few mins.

aulemahal · 2024-02-22T19:15:50Z

I can push something that ensures the new xrfreq is used when we open catalogs (and parse them).

aulemahal · 2024-02-23T21:48:11Z

Last commit added a ensure_new_xrfreq function to utils. It is used when opening a catalog and in parse_directory. This means that legacy frequencies either in the paths or in the catalogs shouldn't be a problem.

Running on MRCC5-disponible, our largest catalog, my n=1 test finds that the opening time has increased by 6%. I decided that this was small enough not to require further optimization or skipping options.

Zeitsperre · 2024-02-26T15:38:38Z

I'll be releasing xclim v0.48.2 today!

Zeitsperre · 2024-02-26T20:41:53Z

This PR is waiting on the newest patch release from conda-forge. Should be available later today.

RondeauG · 2024-02-27T16:25:22Z

xclim>=0.48.0 ou xclim>=0.48.2 ?

# Conflicts: # .github/workflows/main.yml # environment-dev.yml # environment.yml # pyproject.toml

review-notebook-app · 2024-02-27T17:13:38Z

Check out this pull request on

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

juliettelavoie · 2024-02-27T18:35:13Z

tox.ini

@@ -69,6 +69,7 @@ download = true
 deps =
    coveralls: coveralls
    esmpy: git+https://github.com/esmf-org/esmf.git@v{env:ESMF_VERSION}\#subdirectory=src/addon/esmpy
+    xclim: git+https://github.com/Ouranosinc/xclim.git@main


is this still necessary with the new release ?

I figured we could leave it there and have at least one build that checks against the main branch. For xclim, we have a dedicated upstream build; Would it be prudent to implement that here as well? (in another PR)

Ah I see. no strong opinions from me for the upstream build.

You say "no strong opinions", I read "no opposition, go for it". You got it. ;)

aulemahal

One fix, but the rest seems to be good!

xscen/CVs/xrfreq_to_timedelta.json

xscen/catutils.py

juliettelavoie

lgtm

Co-authored-by: Pascal Bourgault <bourgault.pascal@ouranos.ca>

xclim 0.48 compatibility

824c00c

Zeitsperre reviewed Feb 21, 2024

View reviewed changes

environment-dev.yml Outdated Show resolved Hide resolved

environment.yml Outdated Show resolved Hide resolved

pyproject.toml Outdated Show resolved Hide resolved

RondeauG and others added 6 commits February 21, 2024 15:27

pins

5e22eee

converted missing AS-JAN

2753477

temporary removal of measure

26bcf17

install xclim branch temporarily

033d43b

tiret

8a91851

format

35d6060

activate testing for 3.12

b275535

RondeauG mentioned this pull request Feb 22, 2024

Perturbed indicators hydrologie/xhydro#54

Merged

5 tasks

RondeauG and others added 9 commits February 23, 2024 11:26

xclim 0.48 compatibility

1a265b9

pins

15b4d74

converted missing AS-JAN

4ed09a6

temporary removal of measure

6b945c6

install xclim branch temporarily

a169a3c

tiret

c31c271

format

18402d0

activate testing for 3.12

46311d4

install coverage via PyPI

fe90910

Zeitsperre force-pushed the compatxclim48 branch from a6a4d8b to fe90910 Compare February 23, 2024 16:26

Steal code from xarray - ensure new xrfreq on cat open and parsing

75e13dc

Zeitsperre added 4 commits February 26, 2024 10:09

test against xclim main development branch

4fe0ae3

main -> master

c35baca

remove branch install in environment-dev.yml

6331870

install xclim

e3f0473

Skip freq converting in more cases

55bd893

Zeitsperre added 3 commits February 27, 2024 11:22

master -> main

e0ea3ff

Merge remote-tracking branch 'origin/compatxclim48' into compatxclim48

10c1fe9

Merge branch 'main' into compatxclim48

52f1a80

Zeitsperre and others added 4 commits February 27, 2024 11:27

set base xclim pin to v0.48.2, formatting

d741d28

Merge remote-tracking branch 'origin/compatxclim48' into compatxclim48

3ec0951

# Conflicts: # .github/workflows/main.yml # environment-dev.yml # environment.yml # pyproject.toml

upd changes

cf01d49

Update xrfreq to new syntax in notebook

a950298

update CHANGES.rst

d6b3c13

juliettelavoie reviewed Feb 27, 2024

View reviewed changes

aulemahal approved these changes Feb 27, 2024

View reviewed changes

xscen/CVs/xrfreq_to_timedelta.json Outdated Show resolved Hide resolved

juliettelavoie reviewed Feb 27, 2024

View reviewed changes

xscen/catutils.py Outdated Show resolved Hide resolved

Update xscen/catutils.py

c833eef

juliettelavoie approved these changes Feb 27, 2024

View reviewed changes

Update xscen/CVs/xrfreq_to_timedelta.json

6a77239

Co-authored-by: Pascal Bourgault <bourgault.pascal@ouranos.ca>

RondeauG merged commit 90151f3 into main Feb 27, 2024
24 checks passed

RondeauG deleted the compatxclim48 branch February 27, 2024 19:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

xclim 0.48 compatibility #351

xclim 0.48 compatibility #351

RondeauG commented Feb 21, 2024 •

edited

Loading

RondeauG commented Feb 22, 2024

Zeitsperre commented Feb 22, 2024 •

edited

Loading

aulemahal commented Feb 22, 2024

aulemahal commented Feb 23, 2024

Zeitsperre commented Feb 26, 2024

Zeitsperre commented Feb 26, 2024

RondeauG commented Feb 27, 2024

review-notebook-app bot commented Feb 27, 2024

juliettelavoie Feb 27, 2024

Zeitsperre Feb 27, 2024

juliettelavoie Feb 27, 2024

Zeitsperre Feb 27, 2024

aulemahal left a comment

juliettelavoie left a comment

xclim 0.48 compatibility #351

xclim 0.48 compatibility #351

Conversation

RondeauG commented Feb 21, 2024 • edited Loading

Pull Request Checklist:

What kind of change does this PR introduce?

Does this PR introduce a breaking change?

Other information:

RondeauG commented Feb 22, 2024

Zeitsperre commented Feb 22, 2024 • edited Loading

aulemahal commented Feb 22, 2024

aulemahal commented Feb 23, 2024

Zeitsperre commented Feb 26, 2024

Zeitsperre commented Feb 26, 2024

RondeauG commented Feb 27, 2024

review-notebook-app bot commented Feb 27, 2024

juliettelavoie Feb 27, 2024

Choose a reason for hiding this comment

Zeitsperre Feb 27, 2024

Choose a reason for hiding this comment

juliettelavoie Feb 27, 2024

Choose a reason for hiding this comment

Zeitsperre Feb 27, 2024

Choose a reason for hiding this comment

aulemahal left a comment

Choose a reason for hiding this comment

juliettelavoie left a comment

Choose a reason for hiding this comment

RondeauG commented Feb 21, 2024 •

edited

Loading

Zeitsperre commented Feb 22, 2024 •

edited

Loading