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: add upper pin for datatree compatibility #559

Merged
merged 2 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ci/install-upstream-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ conda uninstall -y --force \
regionmask \
scikit-learn \
scipy \
statsmodels \
xarray
statsmodels
# xarray # re-add after removing upper pin for xarray-datatree

# keep cartopy & matplotlib: we don't have tests that use them
# keep joblib: we want to move away from pickle files
Expand All @@ -39,8 +39,8 @@ python -m pip install \
git+https://github.com/fatiando/pooch \
git+https://github.com/geopandas/geopandas \
git+https://github.com/properscoring/properscoring \
git+https://github.com/pydata/xarray \
git+https://github.com/pypa/packaging \
git+https://github.com/pyproj4/pyproj \
git+https://github.com/regionmask/regionmask \
git+https://github.com/SciTools/nc-time-axis
# git+https://github.com/pydata/xarray \
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- scikit-learn
- scipy
- statsmodels>=0.13
- xarray>=2023.04 # because pandas 2 is required
- xarray>=2023.04, <2024.10 # upper pin for xarray-datatree
- xarray-datatree
# for testing
- black!=23
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ install_requires =
scikit-learn >=1.3 # only for the tests
scipy >=1.11
statsmodels >=0.14
xarray >=2023.07
xarray >=2023.07, < 2024.10 # upper pin for xarray-datatree
xarray-datatree >=0.0.13

[options.extras_require]
Expand Down
Loading