From 78d6e48d30908a57b7becf937f823dbed9918631 Mon Sep 17 00:00:00 2001 From: Keewis Date: Mon, 14 Dec 2020 21:24:39 +0100 Subject: [PATCH 01/14] stop to testing on python 3.6 --- ci/requirements/py36.yml | 49 ------------------- ...bare-minimum.yml => py37-bare-minimum.yml} | 2 +- ...min-all-deps.yml => py37-min-all-deps.yml} | 6 +-- ...{py36-min-nep18.yml => py37-min-nep18.yml} | 2 +- 4 files changed, 5 insertions(+), 54 deletions(-) delete mode 100644 ci/requirements/py36.yml rename ci/requirements/{py36-bare-minimum.yml => py37-bare-minimum.yml} (93%) rename ci/requirements/{py36-min-all-deps.yml => py37-min-all-deps.yml} (91%) rename ci/requirements/{py36-min-nep18.yml => py37-min-nep18.yml} (96%) diff --git a/ci/requirements/py36.yml b/ci/requirements/py36.yml deleted file mode 100644 index 97fe92e2271..00000000000 --- a/ci/requirements/py36.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: xarray-tests -channels: - - conda-forge - - nodefaults -dependencies: - - python=3.6 - - black - - boto3 - - bottleneck - - cartopy - - cdms2 - - cfgrib - - cftime - - coveralls - - dask - - distributed - - flake8 - - h5netcdf - - h5py=2 - - hdf5 - - hypothesis - - iris - - isort - - lxml # Optional dep of pydap - - matplotlib-base - - mypy=0.790 # Must match .pre-commit-config.yaml - - nc-time-axis - - netcdf4 - - numba - - numpy - - pandas - - pint - - pip - - pseudonetcdf - - pydap - # - pynio: not compatible with netCDF4>1.5.3; only tested in py36-bare-minimum - - pytest - - pytest-cov - - pytest-env - - pytest-xdist - - rasterio - - scipy - - seaborn - - setuptools - - sparse - - toolz - - zarr - - pip: - - numbagg diff --git a/ci/requirements/py36-bare-minimum.yml b/ci/requirements/py37-bare-minimum.yml similarity index 93% rename from ci/requirements/py36-bare-minimum.yml rename to ci/requirements/py37-bare-minimum.yml index f9255d719de..294b4bd4e72 100644 --- a/ci/requirements/py36-bare-minimum.yml +++ b/ci/requirements/py37-bare-minimum.yml @@ -3,7 +3,7 @@ channels: - conda-forge - nodefaults dependencies: - - python=3.6 + - python=3.7 - coveralls - pip - pytest diff --git a/ci/requirements/py36-min-all-deps.yml b/ci/requirements/py37-min-all-deps.yml similarity index 91% rename from ci/requirements/py36-min-all-deps.yml rename to ci/requirements/py37-min-all-deps.yml index bb25ffcdc76..0c8a23a3e60 100644 --- a/ci/requirements/py36-min-all-deps.yml +++ b/ci/requirements/py37-min-all-deps.yml @@ -7,7 +7,7 @@ dependencies: # Run ci/min_deps_check.py to verify that this file respects the policy. # When upgrading python, numpy, or pandas, must also change # doc/installing.rst and setup.py. - - python=3.6 + - python=3.7 - black - boto3=1.9 - bottleneck=1.2 @@ -33,7 +33,7 @@ dependencies: - numba=0.46 - numpy=1.15 - pandas=0.25 - # - pint # See py36-min-nep18.yml + # - pint # See py37-min-nep18.yml - pip - pseudonetcdf=3.0 - pydap=3.2 @@ -46,7 +46,7 @@ dependencies: - scipy=1.3 - seaborn=0.9 - setuptools=38.4 - # - sparse # See py36-min-nep18.yml + # - sparse # See py37-min-nep18.yml - toolz=0.10 - zarr=2.3 - pip: diff --git a/ci/requirements/py36-min-nep18.yml b/ci/requirements/py37-min-nep18.yml similarity index 96% rename from ci/requirements/py36-min-nep18.yml rename to ci/requirements/py37-min-nep18.yml index 3171c90992d..433f71e5a0d 100644 --- a/ci/requirements/py36-min-nep18.yml +++ b/ci/requirements/py37-min-nep18.yml @@ -5,7 +5,7 @@ channels: dependencies: # Optional dependencies that require NEP18, such as sparse and pint, # require drastically newer packages than everything else - - python=3.6 + - python=3.7 - coveralls - dask=2.9 - distributed=2.9 From a26e88ffdd7074515c7b75101bb05557e88fa36c Mon Sep 17 00:00:00 2001 From: Keewis Date: Mon, 14 Dec 2020 21:25:25 +0100 Subject: [PATCH 02/14] update the trove classifiers --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 9b82926af8a..3bf00c61756 100644 --- a/setup.cfg +++ b/setup.cfg @@ -64,8 +64,8 @@ classifiers = Intended Audience :: Science/Research Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 Topic :: Scientific/Engineering [options] From 5431d4497010dd66c8d167de1709c26ac83240dd Mon Sep 17 00:00:00 2001 From: Keewis Date: Mon, 14 Dec 2020 21:25:34 +0100 Subject: [PATCH 03/14] update the required minimum python version --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 3bf00c61756..4a45a65f394 100644 --- a/setup.cfg +++ b/setup.cfg @@ -72,7 +72,7 @@ classifiers = packages = find: zip_safe = False # https://mypy.readthedocs.io/en/latest/installed_packages.html include_package_data = True -python_requires = >=3.6 +python_requires = >=3.7 install_requires = numpy >= 1.15 pandas >= 0.25 From 999f00c582b15f7c139cbc43257eb6ec9eeb47ad Mon Sep 17 00:00:00 2001 From: Keewis Date: Mon, 14 Dec 2020 21:31:33 +0100 Subject: [PATCH 04/14] update the minimum python version in the install docs --- doc/installing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/installing.rst b/doc/installing.rst index 45999b254ad..7fadba0d2df 100644 --- a/doc/installing.rst +++ b/doc/installing.rst @@ -6,7 +6,7 @@ Installation Required dependencies --------------------- -- Python (3.6 or later) +- Python (3.7 or later) - setuptools (38.4 or later) - `numpy `__ (1.15 or later) - `pandas `__ (0.25 or later) From 5802baa58976307593e1c8946f1477a0d991db79 Mon Sep 17 00:00:00 2001 From: Keewis Date: Mon, 14 Dec 2020 21:34:18 +0100 Subject: [PATCH 05/14] update the pipelines ci matrix --- azure-pipelines.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6682bbdf334..32eaaedf478 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,14 +8,12 @@ jobs: - job: Linux strategy: matrix: - py36-bare-minimum: - conda_env: py36-bare-minimum - py36-min-all-deps: - conda_env: py36-min-all-deps - py36-min-nep18: - conda_env: py36-min-nep18 - py36: - conda_env: py36 + py37-bare-minimum: + conda_env: py37-bare-minimum + py37-min-all-deps: + conda_env: py37-min-all-deps + py37-min-nep18: + conda_env: py37-min-nep18 py37: conda_env: py37 py38: From 56f1f717ea948e8cdde50fa44b4a6735a32960ac Mon Sep 17 00:00:00 2001 From: Keewis Date: Mon, 14 Dec 2020 21:34:49 +0100 Subject: [PATCH 06/14] update the minimum versions check ci --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 32eaaedf478..5e3497ac526 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -119,6 +119,6 @@ jobs: - template: ci/azure/add-conda-to-path.yml - bash: | conda install -y pyyaml - python ci/min_deps_check.py ci/requirements/py36-bare-minimum.yml - python ci/min_deps_check.py ci/requirements/py36-min-all-deps.yml + python ci/min_deps_check.py ci/requirements/py37-bare-minimum.yml + python ci/min_deps_check.py ci/requirements/py37-min-all-deps.yml displayName: minimum versions policy From f3d37d97e8bdea819712262a74be99e63e41501a Mon Sep 17 00:00:00 2001 From: Keewis Date: Mon, 14 Dec 2020 21:43:31 +0100 Subject: [PATCH 07/14] update whats-new.rst --- doc/whats-new.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 4445c9bcbe3..8289a956160 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -22,7 +22,8 @@ v0.16.3 (unreleased) Breaking changes ~~~~~~~~~~~~~~~~ - +- xarray no longer supports python 3.6 (:issue:`4688`, :pull:``) + By `Justus Magin `_. New Features ~~~~~~~~~~~~ From bf41b0a7c81ca58b13e7d9656b9e919d4e32c0b8 Mon Sep 17 00:00:00 2001 From: Keewis Date: Mon, 21 Dec 2020 22:14:21 +0100 Subject: [PATCH 08/14] update the PR number --- 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 8289a956160..106e6888642 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -22,7 +22,7 @@ v0.16.3 (unreleased) Breaking changes ~~~~~~~~~~~~~~~~ -- xarray no longer supports python 3.6 (:issue:`4688`, :pull:``) +- xarray no longer supports python 3.6 (:issue:`4688`, :pull:`4720`) By `Justus Magin `_. New Features From 5ed7fd05e61d0ade34d8a49c971dd79239b05c24 Mon Sep 17 00:00:00 2001 From: Keewis Date: Mon, 21 Dec 2020 23:35:27 +0100 Subject: [PATCH 09/14] upgrade setuptools to 40.4 --- ci/requirements/py37-bare-minimum.yml | 2 +- ci/requirements/py37-min-all-deps.yml | 2 +- ci/requirements/py37-min-nep18.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements/py37-bare-minimum.yml b/ci/requirements/py37-bare-minimum.yml index 294b4bd4e72..fbeb87032b7 100644 --- a/ci/requirements/py37-bare-minimum.yml +++ b/ci/requirements/py37-bare-minimum.yml @@ -12,4 +12,4 @@ dependencies: - pytest-xdist - numpy=1.15 - pandas=0.25 - - setuptools=38.4 + - setuptools=40.4 diff --git a/ci/requirements/py37-min-all-deps.yml b/ci/requirements/py37-min-all-deps.yml index 0c8a23a3e60..feef86ddf5c 100644 --- a/ci/requirements/py37-min-all-deps.yml +++ b/ci/requirements/py37-min-all-deps.yml @@ -45,7 +45,7 @@ dependencies: - rasterio=1.0 - scipy=1.3 - seaborn=0.9 - - setuptools=38.4 + - setuptools=40.4 # - sparse # See py37-min-nep18.yml - toolz=0.10 - zarr=2.3 diff --git a/ci/requirements/py37-min-nep18.yml b/ci/requirements/py37-min-nep18.yml index 433f71e5a0d..aea86261a0e 100644 --- a/ci/requirements/py37-min-nep18.yml +++ b/ci/requirements/py37-min-nep18.yml @@ -18,5 +18,5 @@ dependencies: - pytest-env - pytest-xdist - scipy=1.3 - - setuptools=38.4 + - setuptools=40.4 - sparse=0.8 From 4a180f3c1d09f837d868133ae23d06e2444e0d91 Mon Sep 17 00:00:00 2001 From: keewis Date: Tue, 22 Dec 2020 23:25:48 +0100 Subject: [PATCH 10/14] update the required setuptools version in the install instructions --- doc/installing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/installing.rst b/doc/installing.rst index 7fadba0d2df..0aaf8ad4530 100644 --- a/doc/installing.rst +++ b/doc/installing.rst @@ -7,7 +7,7 @@ Required dependencies --------------------- - Python (3.7 or later) -- setuptools (38.4 or later) +- setuptools (40.4 or later) - `numpy `__ (1.15 or later) - `pandas `__ (0.25 or later) From 7f537f9302884088b2f618f9e46bd639ad3eb675 Mon Sep 17 00:00:00 2001 From: Keewis Date: Sat, 26 Dec 2020 16:38:28 +0100 Subject: [PATCH 11/14] update the policy override for setuptools --- ci/min_deps_check.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/min_deps_check.py b/ci/min_deps_check.py index 95c6ff22aa2..5f94c81ef8a 100755 --- a/ci/min_deps_check.py +++ b/ci/min_deps_check.py @@ -35,9 +35,11 @@ # setuptools-scm doesn't work with setuptools < 36.7 (Nov 2017). # The conda metadata is malformed for setuptools < 38.4 (Jan 2018) # (it's missing a timestamp which prevents this tool from working). + # setuptools < 40.4 (Sep 2018) from conda-forge cannot be installed into a py37 + # environment # TODO remove this special case and the matching note in installing.rst - # after July 2021. - "setuptools": (38, 4), + # after March 2022. + "setuptools": (40, 4), } has_errors = False From 96d2b20b0c5a415928eea4522b8927f090d41d48 Mon Sep 17 00:00:00 2001 From: Keewis Date: Sat, 26 Dec 2020 16:39:34 +0100 Subject: [PATCH 12/14] update whats-new.rst --- doc/whats-new.rst | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index dbabfe98516..d725efd7e44 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -22,7 +22,17 @@ v0.16.3 (unreleased) Breaking changes ~~~~~~~~~~~~~~~~ -- xarray no longer supports python 3.6 (:issue:`4688`, :pull:`4720`) +- xarray no longer supports python 3.6 + + The minimum versions of some other dependencies were changed: + ============ ====== ==== + Package Old New + ============ ====== ==== + Python 3.6 3.7 + setuptools 38.4 40.4 + ============ ====== ==== + + (:issue:`4688`, :pull:`4720`) By `Justus Magin `_. - remove deprecated ``autoclose`` kwargs from :py:func:`open_dataset` (:pull: `4725`). By `Aureliana Barghini `_ From 15c54f2f70e82febb46b53cef6d7a7138cf0d8e1 Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 6 Jan 2021 23:16:57 +0100 Subject: [PATCH 13/14] update the minimum required version of setuptools in setup.cfg --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5f41734c519..a695191bf02 100644 --- a/setup.cfg +++ b/setup.cfg @@ -76,9 +76,9 @@ python_requires = >=3.7 install_requires = numpy >= 1.15 pandas >= 0.25 - setuptools >= 38.4 # For pkg_resources + setuptools >= 40.4 # For pkg_resources setup_requires = - setuptools >= 38.4 + setuptools >= 40.4 setuptools_scm From d7955fc15ccf468904d9bcf93aaec03725a95f11 Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 6 Jan 2021 23:28:05 +0100 Subject: [PATCH 14/14] update the remaining mentions of the setuptools version --- doc/installing.rst | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/installing.rst b/doc/installing.rst index 0aaf8ad4530..d5783e557e1 100644 --- a/doc/installing.rst +++ b/doc/installing.rst @@ -100,7 +100,7 @@ dependencies: - **Python:** 42 months (`NEP-29 `_) -- **setuptools:** 42 months (but no older than 38.4) +- **setuptools:** 42 months (but no older than 40.4) - **numpy:** 24 months (`NEP-29 `_) - **dask and dask.distributed:** 12 months (but no older than 2.9) diff --git a/requirements.txt b/requirements.txt index 3cbeb368c09..23eff8f07cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ numpy >= 1.15 pandas >= 0.25 -setuptools >= 38.4 +setuptools >= 40.4