Pandas 2.2.0 test fixes #8638

nameloCmaS · 2024-01-21T22:27:05Z

Fixes tests mentioned in Pull request #8633 comments.

Further errors in tests etc still remain.

https://pandas.pydata.org/docs/whatsnew/v2.2.0.html#deprecate-aliases-m-q-y-etc-in-favour-of-me-qe-ye-etc-for-offsets

Fix docstrings following Pandas 2.2 date aliases changed

max-sixty · 2024-01-21T23:54:08Z

@nameloCmaS thank you v much!

@spencerkclark any thoughts? You know this better obv. I'll merge if no objections shortly, and we can make any further adjustments along with #8629

doc/whats-new.rst

xarray/tests/test_accessor_dt.py

spencerkclark

Indeed this is awesome, thanks! I think there is maybe one more doctest failure if you don't mind:

=================================== FAILURES ===================================
______________ [doctest] xarray.core.dataarray.DataArray.curvefit ______________
6342                  0.04744543,  0.03602333,  0.03129354,  0.01074885,  0.01284436,
6343                  0.00910995]])
6344         Coordinates:
6345           * x        (x) int64 0 1 2
6346           * time     (time) int64 0 1 2 3 4 5 6 7 8 9 10
6347 
6348         Fit the exponential decay function to the data along the ``time`` dimension:
6349 
6350         >>> fit_result = da.curvefit("time", exp_decay)
6351         >>> fit_result["curvefit_coefficients"].sel(
Differences (unified diff with -expected +actual):
    @@ -1,4 +1,4 @@
     <xarray.DataArray 'curvefit_coefficients' (x: 3)>
    -array([1.05692035, 1.73549638, 2.9421577 ])
    +array([1.05692036, 1.73549638, 2.94215771])
     Coordinates:
       * x        (x) int64 0 1 2

/home/runner/work/xarray/xarray/xarray/core/dataarray.py:6351: DocTestFailure
=========================== short test summary info ============================
FAILED xarray/core/dataarray.py::xarray.core.dataarray.DataArray.curvefit
============= 1 failed, 299 passed, 2 skipped in 65.48s (0:01:05) ==============

xarray/tests/test_accessor_dt.py

xarray/tests/test_cftime_offsets.py

max-sixty · 2024-01-22T00:20:44Z

Indeed this is awesome, thanks! I think there is maybe one more doctest failure if you don't mind:

Yeah, I've had this before. I think aarch64 has different precision, which is annoying. Reverting will make CI pass...

Changed to code-block rather than suppressing the warning as PR comment.

Reverted due to different precision on aarch64 leading to different output.

Reverted

Reverted changes.

max-sixty · 2024-01-22T02:25:33Z

@nameloCmaS we can merge as soon as the conflict is resolved...

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

max-sixty · 2024-01-22T19:10:31Z

@nameloCmaS we can merge as soon as the conflict is resolved...

I tried resolving myself, not 100% sure if correctly; will merge if tests pass

mathause

Thanks for the PR. As a heads up: #8642 might lead to more docstring changes. (Depending on the merge order I can also do the updates in #8642.)

mathause · 2024-01-22T19:12:15Z

xarray/core/_aggregations.py

This file is generated - do we need to update https://github.com/pydata/xarray/blob/main/xarray/util/generate_aggregations.py instead?

Yes please!

Ah, great spot @mathause ...

…xarray into pandas-2.2.0-doc-fix

max-sixty · 2024-01-22T21:38:38Z

For clarity (+because would be great to merge this; it fixes the doctests), a couple of items remaining:

The merge I did slightly broke the whatsnew, so pre-commit & the docs fail
We should change the https://github.com/pydata/xarray/blob/main/xarray/util/generate_aggregations.py rather than the auto-generated file

@nameloCmaS let us know if you want a hand!

nameloCmaS · 2024-01-22T21:49:41Z

For clarity (+because would be great to merge this; it fixes the doctests), a couple of items remaining:

The merge I did slightly broke the whatsnew, so pre-commit & the docs fail

We should change the https://github.com/pydata/xarray/blob/main/xarray/util/generate_aggregations.py rather than the auto-generated file

@nameloCmaS let us know if you want a hand!

Thank you; I'll have a go at both points now. I'll let you know if I get stuck.

Reversed changes

Fixed hangover from clashing commits.

…xarray into pandas-2.2.0-doc-fix

Updated with xarray/util/generate_aggregations.py

nameloCmaS · 2024-01-22T22:48:32Z

Ok... I have redone the changes to _aggregations.py but this time officially as follows:

conda activate xarray-tests
pip install pytest-accept
python xarray/util/generate_aggregations.py
pytest --doctest-modules xarray/core/_aggregations.py --accept || true
pytest --doctest-modules xarray/core/_aggregations.py

Discarded the namedarray/_aggregations.py file as the changes didn't look correct.

Corrected the correction...

xarray/core/dataarray.py

max-sixty · 2024-01-22T23:19:03Z

doc/whats-new.rst


-      ds = xray.Dataset({"t": pd.date_range("2000-01-01", periods=12, freq="M")})
-      ds["t.season"]
+      In[92]: ds = xray.Dataset({"t": pd.date_range("2000-01-01", periods=12, freq="M")})


Should this switch to ME? (We'll see in the docs build, so can wait if you're not sure)

The "code-block" part and then the ":: ipython" above the code means it is static but with syntax highlighting. Doc.

I did this as I didn't want to "change history" and my quick fix of :okwarning: was not ok. The code was correct at v0.4 so shouldn't be refactored to run on modern code.

max-sixty · 2024-01-22T23:19:51Z

Great @nameloCmaS !

If you want to add a whatsnew now or in another PR, please feel free, this deserve some recognition :)

nameloCmaS · 2024-01-22T23:36:43Z

Great @nameloCmaS !

If you want to add a whatsnew now or in another PR, please feel free, this deserve some recognition :)

Thank you! I made a few errors along the way with a lot of help. I will do it in another PR so this one can hopefully be merged.

nameloCmaS added 3 commits January 21, 2024 13:49

Fix doc building following breaking change in Pandas 2.2.0

888c5c3

https://pandas.pydata.org/docs/whatsnew/v2.2.0.html#deprecate-aliases-m-q-y-etc-in-favour-of-me-qe-ye-etc-for-offsets

Further fixes for changed Pandas 2.2 date aliases

3f8ad6b

Fix docstrings following Pandas 2.2 date aliases changed

Merge remote-tracking branch 'upstream/main' into pandas-2.2.0-doc-fix

ccf1a62

nameloCmaS changed the title ~~Pandas 2.2.0 doc fix~~ Pandas 2.2.0 test fixes Jan 21, 2024

max-sixty reviewed Jan 21, 2024

View reviewed changes

doc/whats-new.rst Outdated Show resolved Hide resolved

Update test_cftime_offsets.py

fb70add

max-sixty reviewed Jan 22, 2024

View reviewed changes

xarray/tests/test_accessor_dt.py Outdated Show resolved Hide resolved

spencerkclark reviewed Jan 22, 2024

View reviewed changes

xarray/tests/test_accessor_dt.py Outdated Show resolved Hide resolved

xarray/tests/test_cftime_offsets.py Outdated Show resolved Hide resolved

nameloCmaS added 4 commits January 22, 2024 00:56

Update whats-new.rst

d6084f8

Changed to code-block rather than suppressing the warning as PR comment.

Update dataarray.py

779ba65

Reverted due to different precision on aarch64 leading to different output.

Update test_accessor_dt.py

f9b1403

Reverted

Update test_cftime_offsets.py

f29beff

Reverted changes.

max-sixty added the plan to merge Final call for comments label Jan 22, 2024

max-sixty and others added 2 commits January 22, 2024 11:09

Merge branch 'main' into pandas-2.2.0-doc-fix

288facf

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

6d866c1

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

mathause reviewed Jan 22, 2024

View reviewed changes

spencerkclark mentioned this pull request Jan 22, 2024

more frequency string updates? #8612

Closed

Merge branch 'pandas-2.2.0-doc-fix' of https://github.com/nameloCmaS/…

7962dca

…xarray into pandas-2.2.0-doc-fix

nameloCmaS added 5 commits January 22, 2024 21:50

Update _aggregations.py

90613a9

Reversed changes

Update whats-new.rst

b445f47

Fixed hangover from clashing commits.

Update generate_aggregations.py

31b5ed9

Merge branch 'pandas-2.2.0-doc-fix' of https://github.com/nameloCmaS/…

aaaab45

…xarray into pandas-2.2.0-doc-fix

Update _aggregations.py

5cdf81d

Updated with xarray/util/generate_aggregations.py

Update whats-new.rst

e9a1641

Corrected the correction...

max-sixty reviewed Jan 22, 2024

View reviewed changes

xarray/core/dataarray.py Show resolved Hide resolved

max-sixty reviewed Jan 22, 2024

View reviewed changes

max-sixty merged commit d6deb46 into pydata:main Jan 22, 2024
29 checks passed

nameloCmaS deleted the pandas-2.2.0-doc-fix branch January 23, 2024 00:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pandas 2.2.0 test fixes #8638

Pandas 2.2.0 test fixes #8638

nameloCmaS commented Jan 21, 2024 •

edited

Loading

max-sixty commented Jan 21, 2024

spencerkclark left a comment

max-sixty commented Jan 22, 2024

max-sixty commented Jan 22, 2024

max-sixty commented Jan 22, 2024

mathause left a comment

mathause Jan 22, 2024

dcherian Jan 22, 2024

max-sixty Jan 22, 2024

max-sixty commented Jan 22, 2024

nameloCmaS commented Jan 22, 2024

nameloCmaS commented Jan 22, 2024

max-sixty Jan 22, 2024

nameloCmaS Jan 22, 2024

max-sixty commented Jan 22, 2024

nameloCmaS commented Jan 22, 2024

Pandas 2.2.0 test fixes #8638

Pandas 2.2.0 test fixes #8638

Conversation

nameloCmaS commented Jan 21, 2024 • edited Loading

max-sixty commented Jan 21, 2024

spencerkclark left a comment

Choose a reason for hiding this comment

max-sixty commented Jan 22, 2024

max-sixty commented Jan 22, 2024

max-sixty commented Jan 22, 2024

mathause left a comment

Choose a reason for hiding this comment

mathause Jan 22, 2024

Choose a reason for hiding this comment

dcherian Jan 22, 2024

Choose a reason for hiding this comment

max-sixty Jan 22, 2024

Choose a reason for hiding this comment

max-sixty commented Jan 22, 2024

nameloCmaS commented Jan 22, 2024

nameloCmaS commented Jan 22, 2024

max-sixty Jan 22, 2024

Choose a reason for hiding this comment

nameloCmaS Jan 22, 2024

Choose a reason for hiding this comment

max-sixty commented Jan 22, 2024

nameloCmaS commented Jan 22, 2024

nameloCmaS commented Jan 21, 2024 •

edited

Loading