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

* resolve failing tests * fix nc-time-axis branch ci
pangeo-data · Jun 2, 2021 · d278ec8 · d278ec8
1 parent 37917ee
commit d278ec8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 2 deletions.
diff --git a/ci/requirements/climpred-dev.yml b/ci/requirements/climpred-dev.yml
@@ -55,3 +55,4 @@ dependencies:
   - pip:
       - pytest-lazy-fixture
       - nb_black  # notebook linting
+      - git+https://github.com/aulemahal/nc-time-axis.git@remove-utime
diff --git a/ci/requirements/docs.yml b/ci/requirements/docs.yml
@@ -20,4 +20,5 @@ dependencies:
   - pip
   - pip:
     # Install latest version of climpred.
+    - git+https://github.com/aulemahal/nc-time-axis.git@remove-utime
     - -e ../..
diff --git a/ci/requirements/docs_notebooks.yml b/ci/requirements/docs_notebooks.yml
@@ -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
diff --git a/ci/requirements/minimum-tests.yml b/ci/requirements/minimum-tests.yml
@@ -25,4 +25,5 @@ dependencies:
   - xskillscore>=0.0.18
   - pip:
     - pytest-lazy-fixture
+    - git+https://github.com/aulemahal/nc-time-axis.git@remove-utime
     - -e ../..
diff --git a/climpred/bootstrap.py b/climpred/bootstrap.py
@@ -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)
         if dask.is_dask_collection(bootstrapped_hind):
             bootstrapped_hind = bootstrapped_hind.chunk({"member": -1})
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-xarray<0.18
+xarray
 dask!=2021.03.0
 matplotlib
 ipython