From 227d7d796811614888568c6a724061bb8dd3b47d Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Wed, 17 Mar 2021 22:37:29 -0500 Subject: [PATCH 1/3] Temporarily pin dask<2021.3.0 in CI --- ci/environment-py36-numpy1.16.yml | 7 ++++++- ci/environment-py36-numpy1.17.yml | 7 ++++++- ci/environment-py36.yml | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ci/environment-py36-numpy1.16.yml b/ci/environment-py36-numpy1.16.yml index d6b8c9e..c18962f 100644 --- a/ci/environment-py36-numpy1.16.yml +++ b/ci/environment-py36-numpy1.16.yml @@ -2,7 +2,12 @@ name: xhistogram_test_env dependencies: - python=3.6 - xarray - - dask + # Dask 2021.3.0 introduced a regression which broke xhistogram. + # This regression should be fixed in the next Dask release and we + # should remove the dask version pinning below. + # see https://github.com/dask/dask/pull/7391 + # and https://github.com/xgcm/xhistogram/issues/27 + - dask<2021.3.0 - numpy==1.16 - pytest - pip diff --git a/ci/environment-py36-numpy1.17.yml b/ci/environment-py36-numpy1.17.yml index 2da2522..f01015c 100644 --- a/ci/environment-py36-numpy1.17.yml +++ b/ci/environment-py36-numpy1.17.yml @@ -4,7 +4,12 @@ channels: dependencies: - python=3.6 - xarray - - dask + # Dask 2021.3.0 introduced a regression which broke xhistogram. + # This regression should be fixed in the next Dask release and we + # should remove the dask version pinning below. + # see https://github.com/dask/dask/pull/7391 + # and https://github.com/xgcm/xhistogram/issues/27 + - dask<2021.3.0 - numpy==1.17 - pytest - pip diff --git a/ci/environment-py36.yml b/ci/environment-py36.yml index 46d6013..eb21926 100644 --- a/ci/environment-py36.yml +++ b/ci/environment-py36.yml @@ -2,7 +2,12 @@ name: xhistogram_test_env dependencies: - python=3.6 - xarray - - dask + # Dask 2021.3.0 introduced a regression which broke xhistogram. + # This regression should be fixed in the next Dask release and we + # should remove the dask version pinning below. + # see https://github.com/dask/dask/pull/7391 + # and https://github.com/xgcm/xhistogram/issues/27 + - dask<2021.3.0 - numpy - pytest - pip From 3fded85723945e979e24e3c213d20aefd857948f Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Wed, 17 Mar 2021 22:43:55 -0500 Subject: [PATCH 2/3] Just skip 2021.3.0 in CI --- ci/environment-py36-numpy1.16.yml | 2 +- ci/environment-py36-numpy1.17.yml | 2 +- ci/environment-py36.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/environment-py36-numpy1.16.yml b/ci/environment-py36-numpy1.16.yml index c18962f..95ceeee 100644 --- a/ci/environment-py36-numpy1.16.yml +++ b/ci/environment-py36-numpy1.16.yml @@ -7,7 +7,7 @@ dependencies: # should remove the dask version pinning below. # see https://github.com/dask/dask/pull/7391 # and https://github.com/xgcm/xhistogram/issues/27 - - dask<2021.3.0 + - dask!=2021.3.0 - numpy==1.16 - pytest - pip diff --git a/ci/environment-py36-numpy1.17.yml b/ci/environment-py36-numpy1.17.yml index f01015c..7ca1ed7 100644 --- a/ci/environment-py36-numpy1.17.yml +++ b/ci/environment-py36-numpy1.17.yml @@ -9,7 +9,7 @@ dependencies: # should remove the dask version pinning below. # see https://github.com/dask/dask/pull/7391 # and https://github.com/xgcm/xhistogram/issues/27 - - dask<2021.3.0 + - dask!=2021.3.0 - numpy==1.17 - pytest - pip diff --git a/ci/environment-py36.yml b/ci/environment-py36.yml index eb21926..2f07ca6 100644 --- a/ci/environment-py36.yml +++ b/ci/environment-py36.yml @@ -7,7 +7,7 @@ dependencies: # should remove the dask version pinning below. # see https://github.com/dask/dask/pull/7391 # and https://github.com/xgcm/xhistogram/issues/27 - - dask<2021.3.0 + - dask!=2021.3.0 - numpy - pytest - pip From 965960a3758233b966f05c349175865ffbc5fb52 Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Thu, 18 Mar 2021 13:47:09 -0500 Subject: [PATCH 3/3] Update new CI builds --- ci/environment-py37.yml | 7 ++++++- ci/environment-py38.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ci/environment-py37.yml b/ci/environment-py37.yml index 00b3ea3..a9cc123 100644 --- a/ci/environment-py37.yml +++ b/ci/environment-py37.yml @@ -2,7 +2,12 @@ name: xhistogram_test_env dependencies: - python=3.7 - xarray - - dask + # Dask 2021.3.0 introduced a regression which broke xhistogram. + # This regression should be fixed in the next Dask release and we + # should remove the dask version pinning below. + # see https://github.com/dask/dask/pull/7391 + # and https://github.com/xgcm/xhistogram/issues/27 + - dask!=2021.3.0 - numpy - pytest - pip diff --git a/ci/environment-py38.yml b/ci/environment-py38.yml index 10bba0f..fc5d384 100644 --- a/ci/environment-py38.yml +++ b/ci/environment-py38.yml @@ -2,7 +2,12 @@ name: xhistogram_test_env dependencies: - python=3.8 - xarray - - dask + # Dask 2021.3.0 introduced a regression which broke xhistogram. + # This regression should be fixed in the next Dask release and we + # should remove the dask version pinning below. + # see https://github.com/dask/dask/pull/7391 + # and https://github.com/xgcm/xhistogram/issues/27 + - dask!=2021.3.0 - numpy - pytest - pip