From 56ec5f49beece2506976fbe9cf64c88c62029fab Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Wed, 30 Oct 2019 01:00:28 +0100 Subject: [PATCH 1/4] unpin cftime --- ci/requirements/py36-min-all-deps.yml | 2 +- ci/requirements/py36.yml | 2 +- ci/requirements/py37-windows.yml | 2 +- ci/requirements/py37.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/requirements/py36-min-all-deps.yml b/ci/requirements/py36-min-all-deps.yml index c99ae39e5d9..61d4c0045ac 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.3 # FIXME need 1.0.5 (not released yet); 1.0.4 is broken + - cftime - coveralls - dask=1.2 - distributed=1.27 diff --git a/ci/requirements/py36.yml b/ci/requirements/py36.yml index 6e27cea2ffe..f9847ef6da5 100644 --- a/ci/requirements/py36.yml +++ b/ci/requirements/py36.yml @@ -9,7 +9,7 @@ dependencies: - cartopy - cdms2 - cfgrib - - cftime<1.0.4 # FIXME need 1.0.5 (not released yet); 1.0.4 is broken + - cftime - coveralls - dask - distributed diff --git a/ci/requirements/py37-windows.yml b/ci/requirements/py37-windows.yml index 7027fc11ab7..111cd96c30c 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 # Causes Python interpreter crash on Windows - - cftime<1.0.4 # FIXME need 1.0.5 (not released yet); 1.0.4 is broken + - cftime - coveralls - dask - distributed diff --git a/ci/requirements/py37.yml b/ci/requirements/py37.yml index a4c974c0176..d816019dd65 100644 --- a/ci/requirements/py37.yml +++ b/ci/requirements/py37.yml @@ -9,7 +9,7 @@ dependencies: - cartopy - cdms2 - cfgrib - - cftime<1.0.4 # FIXME need 1.0.5 (not released yet); 1.0.4 is broken + - cftime - coveralls - dask - distributed From 22a1aeaf4c9236aeabbf99a62684c40bb157ba03 Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Wed, 30 Oct 2019 01:16:47 +0100 Subject: [PATCH 2/4] Update ci/requirements/py36-min-all-deps.yml Co-Authored-By: Spencer Clark --- 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 61d4c0045ac..bbc51d09ce2 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 + - cftime=1.0.3 - coveralls - dask=1.2 - distributed=1.27 From f3cfea366ccd8c1e3d9760911daa89e05608eea4 Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Wed, 30 Oct 2019 01:34:51 +0100 Subject: [PATCH 3/4] do not pin to patch version --- 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 bbc51d09ce2..3f10a158f91 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.3 + - cftime=1.0 - coveralls - dask=1.2 - distributed=1.27 From aecf9c014c4b3c17e89a0449685079f5449bf88a Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Wed, 30 Oct 2019 01:45:43 +0100 Subject: [PATCH 4/4] add note on cftime=1.0.4 --- doc/whats-new.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 3ab8618a85a..443be29ac23 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -22,6 +22,11 @@ Breaking changes ~~~~~~~~~~~~~~~~ - Minimum cftime version is now 1.0.3. By `Deepak Cherian `_. + + .. note:: + + cftime version 1.0.4 is broken (`cftime/126 `_), use version 1.0.4.2 instead. + - All leftover support for dates from non-standard calendars through netcdftime, the module included in versions of netCDF4 prior to 1.4 that eventually became the cftime package, has been removed in favor of relying solely on the standalone