From 7bd70a093500233675cf5b3f4f485325fa223903 Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 17 Jun 2021 08:33:04 +0200 Subject: [PATCH 1/2] Drop the additional numpy 1.16 test see: * #774 which drops Python 3.6 * #749 which bumps h5py to 3.2 --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 671322e96c..b2789ad450 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: python-version: [3.7, 3.8] - numpy_version: ['==1.16.4', ''] + numpy_version: [''] services: redis: image: redis From 8f204ea6dfc682edcc088f30c4c1a83df61239cf Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 17 Jun 2021 09:18:25 +0200 Subject: [PATCH 2/2] Test numpy 1.17 as the 'old' version --- .github/workflows/python-package.yml | 2 +- tox.ini | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index b2789ad450..a4fd9e597f 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: python-version: [3.7, 3.8] - numpy_version: [''] + numpy_version: ['', '==1.17.*'] services: redis: image: redis diff --git a/tox.ini b/tox.ini index 1dd87e2717..a9256a9979 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py37-npy{115,116,latest}, py38, docs +envlist = py37-npy{117,latest}, py38, docs [testenv] install_command = pip install --no-binary=numcodecs {opts} {packages} @@ -20,7 +20,7 @@ commands = # main unit test runner py38: pytest -v --cov=zarr --cov-config=.coveragerc zarr # don't collect coverage when running older numpy versions - py37-{npy115,npy116}: pytest -v zarr + py37-npy117: pytest -v zarr # collect coverage and run doctests under py37 py37-npylatest: pytest -v --cov=zarr --cov-config=.coveragerc --doctest-plus zarr --remote-data # generate a coverage report @@ -32,8 +32,7 @@ commands = # print environment for debugging pip freeze deps = - py37-npy115: numpy==1.15.4 - py37-npy116: numpy==1.16.4 + py37-npy117: numpy==1.17.* py37-npylatest,py38: -rrequirements_dev_numpy.txt -rrequirements_dev_minimal.txt -rrequirements_dev_optional.txt