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

xarray dependency adjusted in pyproject.toml #1099

Merged
merged 3 commits into from
Jan 2, 2025

Conversation

konstntokas
Copy link
Contributor

@konstntokas konstntokas commented Jan 2, 2025

Fixes #1094

In #1068 xcube has been adjusted so that it is complient to xarray >=2024.6. However, I forgot to adjust pyproject.toml.

Note that xarray.core.resample.DataArrayResample.quantile now allows dask arrays. Therefore, the test in resample_in_time was adjusted. This is related to the new feature in xarray 2024.7 (https://docs.xarray.dev/en/stable/whats-new.html#id40) and the PR pydata/xarray#9109.

Checklist:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/source/*
  • Changes documented in CHANGES.md
  • GitHub CI passes
  • AppVeyor CI passes
  • Test coverage remains or increases (target 100%)

@konstntokas
Copy link
Contributor Author

CI fails due to other tests, which are not related to this PR.

@konstntokas konstntokas requested a review from pont-us January 2, 2025 10:40
Copy link
Member

@pont-us pont-us left a comment

Choose a reason for hiding this comment

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

Looks good, except that you need to update the minimum xarray dependency version (see comment). But approving since I don't need to review again.

pyproject.toml Outdated
@@ -55,7 +55,7 @@ dependencies = [
"tabulate>=0.9",
"tornado>=6.0",
"urllib3>=1.26",
"xarray>=2022.6,<=2024.6",
"xarray>=2022.6",
Copy link
Member

@pont-us pont-us Jan 2, 2025

Choose a reason for hiding this comment

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

Suggested change
"xarray>=2022.6",
"xarray>=2024.7",

The updated test will of course fail for any xarray version under 2024.7, so we need to update the minimum version. Alternatively we could have the test change its behaviour depending on the xarray version, but I think there's no harm in bumping the dependency specification.

(And the same goes for the xarray specification in environment.yml.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changes applied in pyproject.toml and environement.yml.

@pont-us
Copy link
Member

pont-us commented Jan 2, 2025

Fixes #1094

@konstntokas konstntokas force-pushed the konstntokas-xxx-adjust_xarray_dependency branch from 32bbb1d to 8ad5f0a Compare January 2, 2025 14:09
@konstntokas konstntokas merged commit 7cce4f3 into main Jan 2, 2025
1 of 3 checks passed
@konstntokas konstntokas deleted the konstntokas-xxx-adjust_xarray_dependency branch January 2, 2025 14:19
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.

test_resample_in_time_p90_dask failing
2 participants