From 3cb00b5f7d8d8fd146e3b9b9756f9af3434ff1d2 Mon Sep 17 00:00:00 2001 From: jmoore Date: Fri, 22 Oct 2021 10:15:24 +0200 Subject: [PATCH 1/6] Activate Python 3.9 --- .github/workflows/python-package.yml | 2 +- .github/workflows/windows-testing.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 9261187caf..f0625a7d05 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] + python-version: [3.7, 3.8, 3.9] numpy_version: ['!=1.21.0', '==1.17.*'] services: redis: diff --git a/.github/workflows/windows-testing.yml b/.github/workflows/windows-testing.yml index 5eaafefbf4..56eecf25e9 100644 --- a/.github/workflows/windows-testing.yml +++ b/.github/workflows/windows-testing.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: True matrix: - python-version: ["3.8"] + python-version: ["3.8", "3.9"] steps: - uses: actions/checkout@v2 with: From 783a932c10a6ba44645cf4b1c0420d6d70100d62 Mon Sep 17 00:00:00 2001 From: jmoore Date: Mon, 25 Oct 2021 08:44:54 +0200 Subject: [PATCH 2/6] bump numcodecs to 0.9.1 --- requirements_dev_minimal.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev_minimal.txt b/requirements_dev_minimal.txt index 12ae808ce6..a1d50c8247 100644 --- a/requirements_dev_minimal.txt +++ b/requirements_dev_minimal.txt @@ -1,7 +1,7 @@ # library requirements asciitree==0.3.3 fasteners==0.16.3 -numcodecs==0.8.1 +numcodecs==0.9.1 msgpack-python==0.5.6 setuptools-scm==6.3.2 # test requirements From 35a9b835b4e342e5bba5577498b7961c01653904 Mon Sep 17 00:00:00 2001 From: jmoore Date: Mon, 25 Oct 2021 09:12:08 +0200 Subject: [PATCH 3/6] Remove numcodecs 0.6.4 pins --- .github/workflows/python-package.yml | 2 +- .github/workflows/windows-testing.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f0625a7d05..6608d74485 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -47,7 +47,7 @@ jobs: - name: Create Conda environment with the rights deps shell: "bash -l {0}" run: | - conda create -n zarr-env python==${{matrix.python-version}} bsddb3 numcodecs==0.6.4 lmdb pip nodejs flake8 mypy + conda create -n zarr-env python==${{matrix.python-version}} bsddb3 numcodecs lmdb pip nodejs flake8 mypy conda activate zarr-env npm install -g azurite - name: Install dependencies diff --git a/.github/workflows/windows-testing.yml b/.github/workflows/windows-testing.yml index 56eecf25e9..af656aa88d 100644 --- a/.github/workflows/windows-testing.yml +++ b/.github/workflows/windows-testing.yml @@ -31,7 +31,7 @@ jobs: - name: Create Conda environment with the rights deps shell: bash -l {0} run: | - conda create -n zarr-env python==${{matrix.python-version}} numcodecs==0.6.4 pip nodejs + conda create -n zarr-env python==${{matrix.python-version}} numcodecs pip nodejs - name: Install dependencies shell: bash -l {0} run: | From d126f168b08b18e75f19ad1bd0b24848ff08c496 Mon Sep 17 00:00:00 2001 From: jmoore Date: Mon, 25 Oct 2021 12:20:28 +0200 Subject: [PATCH 4/6] skip numpy 1.17 on py39 --- .github/workflows/python-package.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6608d74485..379b1deb0a 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -17,6 +17,9 @@ jobs: matrix: python-version: [3.7, 3.8, 3.9] numpy_version: ['!=1.21.0', '==1.17.*'] + exclude: + - python-version: 3.9 + - numpy_version: '==1.17.*' services: redis: image: redis From 0a9f1c076e0077717bda623611a925ea2201a4a9 Mon Sep 17 00:00:00 2001 From: jmoore Date: Mon, 25 Oct 2021 12:20:32 +0200 Subject: [PATCH 5/6] update tox.ini --- tox.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index a9256a9979..9e0212cc5e 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py37-npy{117,latest}, py38, docs +envlist = py37-npy{117,latest}, py38, py39, docs [testenv] install_command = pip install --no-binary=numcodecs {opts} {packages} @@ -18,17 +18,17 @@ 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: pytest -v --cov=zarr --cov-config=.coveragerc zarr + py{38,39}: pytest -v --cov=zarr --cov-config=.coveragerc zarr # don't collect coverage when running older numpy versions 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 - py37-npylatest,py38: coverage report -m + py37-npylatest,py38,py39: 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 + py{38,39}: python -m doctest -o NORMALIZE_WHITESPACE -o ELLIPSIS docs/tutorial.rst docs/spec/v2.rst # pep8 checks - py38: flake8 zarr + py{38,39}: flake8 zarr # print environment for debugging pip freeze deps = From fd7251bcbf1eaadc22c4bfab792ba14a10a64f1d Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Mon, 8 Nov 2021 15:34:14 +0100 Subject: [PATCH 6/6] Exclude AND of py39 & numpy 1.17 --- .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 379b1deb0a..3d53ac43ad 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -19,7 +19,7 @@ jobs: numpy_version: ['!=1.21.0', '==1.17.*'] exclude: - python-version: 3.9 - - numpy_version: '==1.17.*' + numpy_version: '==1.17.*' services: redis: image: redis