From d8e10dd43621535a3b26eccd06d7fd59c2555f65 Mon Sep 17 00:00:00 2001 From: dcherian Date: Tue, 22 Oct 2019 09:31:05 -0600 Subject: [PATCH 1/4] Add cftime git tip to upstream-dev + temporarily pin cftime --- ci/azure/install.yml | 3 ++- ci/requirements/py36.yml | 2 +- ci/requirements/py37-windows.yml | 2 +- ci/requirements/py37.yml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/azure/install.yml b/ci/azure/install.yml index 8d72ffce124..f1192f4424f 100644 --- a/ci/azure/install.yml +++ b/ci/azure/install.yml @@ -24,7 +24,8 @@ steps: --upgrade \ git+https://github.com/dask/dask \ git+https://github.com/dask/distributed \ - git+https://github.com/zarr-developers/zarr + git+https://github.com/zarr-developers/zarr \ + git+https://github.com/Unidata/cftime condition: eq(variables['UPSTREAM_DEV'], 'true') displayName: Install upstream dev dependencies diff --git a/ci/requirements/py36.yml b/ci/requirements/py36.yml index cc91e8a12da..6440495e1d8 100644 --- a/ci/requirements/py36.yml +++ b/ci/requirements/py36.yml @@ -9,7 +9,7 @@ dependencies: - cartopy - cdms2 - cfgrib - - cftime + - cftime=1.0.3.4 - coveralls - dask - distributed diff --git a/ci/requirements/py37-windows.yml b/ci/requirements/py37-windows.yml index bf485b59a49..f3397cd4d2d 100644 --- a/ci/requirements/py37-windows.yml +++ b/ci/requirements/py37-windows.yml @@ -9,7 +9,7 @@ dependencies: - cartopy # - cdms2 # Not available on Windows # - cfgrib>=0.9.2 # Causes Python interpreter crash on Windows - - cftime + - cftime=1.0.3.4 - coveralls - dask - distributed diff --git a/ci/requirements/py37.yml b/ci/requirements/py37.yml index 5c9a1cec5b5..d2865c9f9ab 100644 --- a/ci/requirements/py37.yml +++ b/ci/requirements/py37.yml @@ -9,7 +9,7 @@ dependencies: - cartopy - cdms2 - cfgrib - - cftime + - cftime=1.0.3.4 - coveralls - dask - distributed From 661c065ccec1fa4e7dc9a07afd997dafa0434d5f Mon Sep 17 00:00:00 2001 From: dcherian Date: Tue, 22 Oct 2019 09:58:29 -0600 Subject: [PATCH 2/4] specify cftime min version as 1.0.0 --- ci/requirements/py36-min-all-deps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements/py36-min-all-deps.yml b/ci/requirements/py36-min-all-deps.yml index 4e4f8550e16..297e379bd7b 100644 --- a/ci/requirements/py36-min-all-deps.yml +++ b/ci/requirements/py36-min-all-deps.yml @@ -13,7 +13,7 @@ dependencies: - cartopy=0.17 - cdms2=3.1 - cfgrib=0.9 - - cftime=1.0 + - cftime=1.0.0 - coveralls - dask=1.2 - distributed=1.27 From d7b496f48059283a229be1a53f62cddaef6c08f4 Mon Sep 17 00:00:00 2001 From: dcherian Date: Tue, 22 Oct 2019 10:32:41 -0600 Subject: [PATCH 3/4] Min cftime version 1.0.3 --- ci/requirements/py36-min-all-deps.yml | 2 +- doc/whats-new.rst | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/requirements/py36-min-all-deps.yml b/ci/requirements/py36-min-all-deps.yml index 297e379bd7b..f8f324bd1ae 100644 --- a/ci/requirements/py36-min-all-deps.yml +++ b/ci/requirements/py36-min-all-deps.yml @@ -13,7 +13,7 @@ dependencies: - cartopy=0.17 - cdms2=3.1 - cfgrib=0.9 - - cftime=1.0.0 + - cftime=1.0.3 - coveralls - dask=1.2 - distributed=1.27 diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 9e14120aeb3..d1f0b68cd40 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -18,6 +18,10 @@ What's New v0.14.1 (unreleased) -------------------- +Breaking changes +~~~~~~~~~~~~~~~~ + +- Minimum cftime version is now 1.0.3. By `Deepak Cherian `_. .. _whats-new.0.14.0: From fa9b644dd3d41d5bedb4b040d71f101590e48d11 Mon Sep 17 00:00:00 2001 From: dcherian Date: Tue, 22 Oct 2019 10:38:30 -0600 Subject: [PATCH 4/4] wn --- doc/whats-new.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 9d312811a2a..ede18c3b147 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -22,6 +22,7 @@ Breaking changes ~~~~~~~~~~~~~~~~ - Minimum cftime version is now 1.0.3. By `Deepak Cherian `_. + New Features ~~~~~~~~~~~~ - Added integration tests against `pint `_.