From 550e7c25326787e01377ec87af997f331c865c86 Mon Sep 17 00:00:00 2001 From: Bill Little Date: Thu, 21 Oct 2021 15:09:23 +0100 Subject: [PATCH 1/2] min pin for numpy (nep29) --- requirements/ci/py37.yml | 2 +- requirements/ci/py38.yml | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/ci/py37.yml b/requirements/ci/py37.yml index 09d54a1ceb..162461a9fd 100644 --- a/requirements/ci/py37.yml +++ b/requirements/ci/py37.yml @@ -16,7 +16,7 @@ dependencies: - dask >=2 - matplotlib - netcdf4 - - numpy >=1.14 + - numpy >=1.18 - python-xxhash - scipy diff --git a/requirements/ci/py38.yml b/requirements/ci/py38.yml index bb6f98403a..11a0a1f03a 100644 --- a/requirements/ci/py38.yml +++ b/requirements/ci/py38.yml @@ -16,7 +16,7 @@ dependencies: - dask >=2 - matplotlib - netcdf4 - - numpy >=1.14 + - numpy >=1.18 - python-xxhash - scipy diff --git a/setup.cfg b/setup.cfg index 68e141a457..3d70337627 100644 --- a/setup.cfg +++ b/setup.cfg @@ -53,7 +53,7 @@ install_requires = dask[array]>=2 matplotlib netcdf4 - numpy>=1.14 + numpy>=1.18 scipy xxhash packages = find: From 33f375ed54257e18b43930b04a25b8db8f631386 Mon Sep 17 00:00:00 2001 From: Bill Little Date: Fri, 22 Oct 2021 09:26:13 +0100 Subject: [PATCH 2/2] add whatsnew and bump to 1.19 for iris 3.2 --- docs/src/whatsnew/latest.rst | 4 ++++ requirements/ci/py37.yml | 2 +- requirements/ci/py38.yml | 2 +- setup.cfg | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst index c898734de9..8111a9aec1 100644 --- a/docs/src/whatsnew/latest.rst +++ b/docs/src/whatsnew/latest.rst @@ -126,6 +126,9 @@ This document explains the changes made to Iris for this release #. `@trexfeathers`_ introduced the ``cf-units >=3`` and ``nc-time-axis >=1.3`` minimum pins. (:pull:`4356`) +#. `@bjlittle`_ introduced the ``numpy >=1.19`` minimum pin, in + accordance with `NEP-29`_ deprecation policy. (:pull:`4386`) + 📚 Documentation ================ @@ -191,5 +194,6 @@ This document explains the changes made to Iris for this release Whatsnew resources in alphabetical order: .. _GitHub: https://github.com/SciTools/iris/issues/new/choose +.. _NEP-29: https://numpy.org/neps/nep-0029-deprecation_policy.html .. _UGRID: http://ugrid-conventions.github.io/ugrid-conventions/ .. _sort-all: https://github.com/aio-libs/sort-all diff --git a/requirements/ci/py37.yml b/requirements/ci/py37.yml index 162461a9fd..abc5352e22 100644 --- a/requirements/ci/py37.yml +++ b/requirements/ci/py37.yml @@ -16,7 +16,7 @@ dependencies: - dask >=2 - matplotlib - netcdf4 - - numpy >=1.18 + - numpy >=1.19 - python-xxhash - scipy diff --git a/requirements/ci/py38.yml b/requirements/ci/py38.yml index 11a0a1f03a..a36ce243ed 100644 --- a/requirements/ci/py38.yml +++ b/requirements/ci/py38.yml @@ -16,7 +16,7 @@ dependencies: - dask >=2 - matplotlib - netcdf4 - - numpy >=1.18 + - numpy >=1.19 - python-xxhash - scipy diff --git a/setup.cfg b/setup.cfg index 3d70337627..0af95469b9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -53,7 +53,7 @@ install_requires = dask[array]>=2 matplotlib netcdf4 - numpy>=1.18 + numpy>=1.19 scipy xxhash packages = find: