From b42e40a6382086182b000f8f35860baad2dedf95 Mon Sep 17 00:00:00 2001 From: Keewis Date: Mon, 22 Feb 2021 17:20:30 +0100 Subject: [PATCH 1/6] update all dependencies --- ci/requirements/py37-bare-minimum.yml | 4 ++-- ci/requirements/py37-min-all-deps.yml | 34 +++++++++++++-------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ci/requirements/py37-bare-minimum.yml b/ci/requirements/py37-bare-minimum.yml index fbeb87032b7..408cf76fdd6 100644 --- a/ci/requirements/py37-bare-minimum.yml +++ b/ci/requirements/py37-bare-minimum.yml @@ -10,6 +10,6 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist - - numpy=1.15 - - pandas=0.25 + - numpy=1.17 + - pandas=1.0 - setuptools=40.4 diff --git a/ci/requirements/py37-min-all-deps.yml b/ci/requirements/py37-min-all-deps.yml index 166836243b4..78e758f6275 100644 --- a/ci/requirements/py37-min-all-deps.yml +++ b/ci/requirements/py37-min-all-deps.yml @@ -8,42 +8,42 @@ dependencies: # When upgrading python, numpy, or pandas, must also change # doc/installing.rst and setup.py. - python=3.7 - - boto3=1.9 - - bottleneck=1.2 + - boto3=1.12 + - bottleneck=1.3 - cartopy=0.17 - cdms2=3.1 - cfgrib=0.9 - cftime=1.0 - coveralls - - dask=2.9 - - distributed=2.9 - - h5netcdf=0.7 - - h5py=2.9 # Policy allows for 2.10, but it's a conflict-fest + - dask=2.11 + - distributed=2.11 + - h5netcdf=0.8 + - h5py=2.10 # Policy allows for 2.10, but it's a conflict-fest - hdf5=1.10 - hypothesis - - iris=2.2 - - lxml=4.4 # Optional dep of pydap + - iris=2.4 + - lxml=4.5 # Optional dep of pydap - matplotlib-base=3.1 - nc-time-axis=1.2 - - netcdf4=1.4 - - numba=0.46 - - numpy=1.15 - - pandas=0.25 + - netcdf4=1.5 + - numba=0.48 + - numpy=1.17 + - pandas=1.0 # - pint # See py37-min-nep18.yml - pip - - pseudonetcdf=3.0 + - pseudonetcdf=3.1 - pydap=3.2 - pynio=1.5 - pytest - pytest-cov - pytest-env - pytest-xdist - - rasterio=1.0 - - scipy=1.3 - - seaborn=0.9 + - rasterio=1.1 + - scipy=1.4 + - seaborn=0.10 - setuptools=40.4 # - sparse # See py37-min-nep18.yml - toolz=0.10 - - zarr=2.3 + - zarr=2.4 - pip: - numbagg==0.1 From c96b43947a5067cdfed4b0390ba04bbfe509265e Mon Sep 17 00:00:00 2001 From: Keewis Date: Tue, 23 Feb 2021 15:59:19 +0100 Subject: [PATCH 2/6] document the bumped dependencies [skip-ci] --- doc/whats-new.rst | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 0b2b2834626..edb543415d0 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -25,15 +25,30 @@ Breaking changes - xarray no longer supports python 3.6 The minimum version policy was changed to also apply to projects with irregular - releases. - - The minimum versions of some other dependencies were changed: + releases. As a result, the minimum versions of some dependencies were changed: ============ ====== ==== Package Old New ============ ====== ==== Python 3.6 3.7 setuptools 38.4 40.4 + numpy 1.15 1.17 + pandas 0.25 1.0 + dask 2.9 2.11 + distributed 2.9 2.11 + boto3 1.9 1.12 + bottleneck 1.2 1.3 + h5netcdf 0.7 0.8 + h5py 0.9 2.10 + iris 2.2 2.4 + lxml 4.4 4.5 + netcdf4 1.4 1.5 + numba 0.46 0.48 + pseudonetcdf 3.0 3.1 + rasterio 1.0 1.1 + scipy 1.3 1.4 + seaborn 0.9 0.10 + zarr 2.3 2.4 ============ ====== ==== (:issue:`4688`, :pull:`4720`, :pull:`4907`) From af581fa6c36858cfefc5390628c22d619f89cebb Mon Sep 17 00:00:00 2001 From: Keewis Date: Tue, 23 Feb 2021 20:26:33 +0100 Subject: [PATCH 3/6] don't list the indirect dependencies [skip-ci] --- doc/whats-new.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index edb543415d0..ec041f0fe59 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -36,14 +36,10 @@ Breaking changes pandas 0.25 1.0 dask 2.9 2.11 distributed 2.9 2.11 - boto3 1.9 1.12 bottleneck 1.2 1.3 h5netcdf 0.7 0.8 - h5py 0.9 2.10 iris 2.2 2.4 - lxml 4.4 4.5 netcdf4 1.4 1.5 - numba 0.46 0.48 pseudonetcdf 3.0 3.1 rasterio 1.0 1.1 scipy 1.3 1.4 From abb19f0fe23c2de93f233b7bb4ec666d455cfd3d Mon Sep 17 00:00:00 2001 From: Keewis Date: Tue, 23 Feb 2021 20:34:12 +0100 Subject: [PATCH 4/6] minor fix --- doc/whats-new.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index ec041f0fe59..57bda3c39db 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -25,7 +25,7 @@ Breaking changes - xarray no longer supports python 3.6 The minimum version policy was changed to also apply to projects with irregular - releases. As a result, the minimum versions of some dependencies were changed: + releases. As a result, the minimum versions of some dependencies have changed: ============ ====== ==== Package Old New From 2d099060778bb0cda2efddd94d4b3267119cfa51 Mon Sep 17 00:00:00 2001 From: Keewis Date: Tue, 23 Feb 2021 20:35:19 +0100 Subject: [PATCH 5/6] remove the comment about conflicts with h5py=2.10 [skip-ci] --- ci/requirements/py37-min-all-deps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements/py37-min-all-deps.yml b/ci/requirements/py37-min-all-deps.yml index 78e758f6275..c2fd2e18a8a 100644 --- a/ci/requirements/py37-min-all-deps.yml +++ b/ci/requirements/py37-min-all-deps.yml @@ -18,7 +18,7 @@ dependencies: - dask=2.11 - distributed=2.11 - h5netcdf=0.8 - - h5py=2.10 # Policy allows for 2.10, but it's a conflict-fest + - h5py=2.10 - hdf5=1.10 - hypothesis - iris=2.4 From c06292f92112147ba50baecf21d7581dbfd2857d Mon Sep 17 00:00:00 2001 From: Keewis Date: Tue, 23 Feb 2021 20:50:10 +0100 Subject: [PATCH 6/6] update whats-new.rst [skip-ci] --- doc/whats-new.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 57bda3c39db..c982eb47021 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -47,7 +47,7 @@ Breaking changes zarr 2.3 2.4 ============ ====== ==== - (:issue:`4688`, :pull:`4720`, :pull:`4907`) + (:issue:`4688`, :pull:`4720`, :pull:`4907`, :pull:`4942`) By `Justus Magin `_. - use ``pyproject.toml`` instead of the ``setup_requires`` option for ``setuptools`` (:pull:`4897`).