From 88b9e9915154badc0d1c85a088f1fcf46130080d Mon Sep 17 00:00:00 2001 From: jmoore Date: Tue, 15 Jun 2021 15:13:30 +0200 Subject: [PATCH] Rollback py39 attempt --- .github/workflows/python-package.yml | 2 +- tox.ini | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 34a69407c8..671322e96c 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: [3.7, 3.8] numpy_version: ['==1.16.4', ''] services: redis: diff --git a/tox.ini b/tox.ini index 330ffb3b5c..1dd87e2717 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, py39, docs +envlist = py37-npy{115,116,latest}, py38, docs [testenv] install_command = pip install --no-binary=numcodecs {opts} {packages} @@ -18,13 +18,13 @@ commands = # clear out any data files generated during tests python -c 'import glob; import shutil; import os; [(shutil.rmtree(d) if os.path.isdir(d) else os.remove(d) if os.path.isfile(d) else None) for d in glob.glob("./example*")]' # main unit test runner - py38,py39: pytest -v --cov=zarr --cov-config=.coveragerc zarr + py38: pytest -v --cov=zarr --cov-config=.coveragerc zarr # don't collect coverage when running older numpy versions py37-{npy115,npy116}: 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 - py37-npylatest,py38,py39: coverage report -m + py37-npylatest,py38: coverage report -m # run doctests in the tutorial and spec py38: python -m doctest -o NORMALIZE_WHITESPACE -o ELLIPSIS docs/tutorial.rst docs/spec/v2.rst # pep8 checks @@ -34,7 +34,7 @@ commands = deps = py37-npy115: numpy==1.15.4 py37-npy116: numpy==1.16.4 - py37-npylatest,py38,py39: -rrequirements_dev_numpy.txt + py37-npylatest,py38: -rrequirements_dev_numpy.txt -rrequirements_dev_minimal.txt -rrequirements_dev_optional.txt