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.

Sign up for GitHub

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

Jump to bottom

unfix xarray, use nc-time-axis branch utime fix #620

Merged
merged 5 commits into from
Jun 2, 2021
Merged

unfix xarray, use nc-time-axis branch utime fix #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
241657a
resolve failing tests
Jun 2, 2021
a8fee3e
fix req.txt
Jun 2, 2021
e5dde43
fix req.txt
Jun 2, 2021
fc25876
fix req.txt
Jun 2, 2021
2b08994
fix nc-time-axis branch ci
Jun 2, 2021
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
1 change: 1 addition & 0 deletions ci/requirements/climpred-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,4 @@ dependencies:
- pip:
- pytest-lazy-fixture
- nb_black # notebook linting
- git+https://github.com/aulemahal/nc-time-axis.git@remove-utime
1 change: 1 addition & 0 deletions ci/requirements/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ dependencies:
- pip
- pip:
# Install latest version of climpred.
- git+https://github.com/aulemahal/nc-time-axis.git@remove-utime
- -e ../..
1 change: 1 addition & 0 deletions ci/requirements/docs_notebooks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ dependencies:
- pip
- pip:
# Install latest version of climpred.
- git+https://github.com/aulemahal/nc-time-axis.git@remove-utime
- -e ../..
- nb_black
1 change: 1 addition & 0 deletions ci/requirements/minimum-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ dependencies:
- xskillscore>=0.0.18
- pip:
- pytest-lazy-fixture
- git+https://github.com/aulemahal/nc-time-axis.git@remove-utime
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

should be reverted to nc-time-axis main once merged and released

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

#621

- -e ../..
3 changes: 2 additions & 1 deletion climpred/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,8 @@ def bootstrap_compute(
if isHindcast and comparison != __m2o:
bootstrapped_uninit_skill = bootstrapped_uninit_skill.mean("member")

bootstrapped_hind = resample_func(hind, iterations, resample_dim)
with xr.set_options(keep_attrs=True):
bootstrapped_hind = resample_func(hind, iterations, resample_dim)
Comment on lines +820 to +821
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

somehow attrs were dropped here now. why not before? unclear. fixed.

if dask.is_dask_collection(bootstrapped_hind):
bootstrapped_hind = bootstrapped_hind.chunk({"member": -1})

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
xarray<0.18
xarray
dask!=2021.03.0
matplotlib
ipython
Expand Down