From e21b7015bc166f69c4193cd7f9e8ed5ce3035aaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 04:43:56 +0000 Subject: [PATCH 1/3] Bump azure-storage-blob from 12.16.0 to 12.18.3 Bumps [azure-storage-blob](https://github.com/Azure/azure-sdk-for-python) from 12.16.0 to 12.18.3. - [Release notes](https://github.com/Azure/azure-sdk-for-python/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/esrp_release.md) - [Commits](https://github.com/Azure/azure-sdk-for-python/compare/azure-storage-blob_12.16.0...azure-storage-blob_12.18.3) --- updated-dependencies: - dependency-name: azure-storage-blob dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements_dev_optional.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev_optional.txt b/requirements_dev_optional.txt index baa2fbc1e9..28bc74ad2a 100644 --- a/requirements_dev_optional.txt +++ b/requirements_dev_optional.txt @@ -7,7 +7,7 @@ ipywidgets==8.1.0 # optional library requirements for services # don't let pyup change pinning for azure-storage-blob, need to pin to older # version to get compatibility with azure storage emulator on appveyor (FIXME) -azure-storage-blob==12.16.0 # pyup: ignore +azure-storage-blob==12.18.3 # pyup: ignore redis==4.6.0 types-redis types-setuptools From 43e6aafb0c5864ad9924d64d69d722c732b0937b Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 15 Feb 2024 11:06:24 +0100 Subject: [PATCH 2/3] Skip ABS testing on Python 3.9 --- .github/workflows/python-package.yml | 7 ++++++- .github/workflows/windows-testing.yml | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index d74df9ce67..01956f5183 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -68,12 +68,17 @@ jobs: shell: "bash -l {0}" env: COVERAGE_FILE: .coverage.${{matrix.python-version}}.${{matrix.numpy_version}} - ZARR_TEST_ABS: 1 ZARR_TEST_MONGO: 1 ZARR_TEST_REDIS: 1 ZARR_V3_EXPERIMENTAL_API: 1 ZARR_V3_SHARDING: 1 run: | + # Skip ABS on 3.9, see https://github.com/zarr-developers/zarr-python/pull/1542/#issuecomment-1945557365 etc. + if [[ "${{ matrix.python-version }}" == '3.9' ]]; then + echo "ZARR_TEST_ABS=0" >> "$GITHUB_ENV" + else + echo "ZARR_TEST_ABS=1" >> "$GITHUB_ENV" + fi conda activate zarr-env mkdir ~/blob_emulator azurite -l ~/blob_emulator --debug debug.log 2>&1 > stdouterr.log & diff --git a/.github/workflows/windows-testing.yml b/.github/workflows/windows-testing.yml index 0ef7f21758..1e1f132c3c 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.10', '3.11'] + python-version: ['3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v4 with: @@ -45,12 +45,17 @@ jobs: - name: Run Tests shell: bash -l {0} run: | + # Skip ABS on 3.9, see https://github.com/zarr-developers/zarr-python/pull/1542/#issuecomment-1945557365 etc. + if [[ "${{ matrix.python-version }}" == '3.9' ]]; then + echo "ZARR_TEST_ABS=0" >> "$GITHUB_ENV" + else + echo "ZARR_TEST_ABS=1" >> "$GITHUB_ENV" + fi conda activate zarr-env mkdir ~/blob_emulator azurite -l ~/blob_emulator --debug debug.log 2>&1 > stdouterr.log & pytest -sv --timeout=300 env: - ZARR_TEST_ABS: 1 ZARR_V3_EXPERIMENTAL_API: 1 ZARR_V3_SHARDING: 1 - name: Conda info From 2b5143d940e96b16d70c5351f35944460c8ddf5d Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 15 Feb 2024 12:03:51 +0100 Subject: [PATCH 3/3] Filter s3 rather than ABS --- .github/workflows/python-package.yml | 4 +--- .github/workflows/windows-testing.yml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 01956f5183..7577092f3f 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -75,9 +75,7 @@ jobs: run: | # Skip ABS on 3.9, see https://github.com/zarr-developers/zarr-python/pull/1542/#issuecomment-1945557365 etc. if [[ "${{ matrix.python-version }}" == '3.9' ]]; then - echo "ZARR_TEST_ABS=0" >> "$GITHUB_ENV" - else - echo "ZARR_TEST_ABS=1" >> "$GITHUB_ENV" + export PYTEST_ADDOPTS="-k 'not test_s3'" fi conda activate zarr-env mkdir ~/blob_emulator diff --git a/.github/workflows/windows-testing.yml b/.github/workflows/windows-testing.yml index 1e1f132c3c..c2786df094 100644 --- a/.github/workflows/windows-testing.yml +++ b/.github/workflows/windows-testing.yml @@ -47,9 +47,7 @@ jobs: run: | # Skip ABS on 3.9, see https://github.com/zarr-developers/zarr-python/pull/1542/#issuecomment-1945557365 etc. if [[ "${{ matrix.python-version }}" == '3.9' ]]; then - echo "ZARR_TEST_ABS=0" >> "$GITHUB_ENV" - else - echo "ZARR_TEST_ABS=1" >> "$GITHUB_ENV" + export PYTEST_ADDOPTS="-k 'not test_s3'" fi conda activate zarr-env mkdir ~/blob_emulator