From 323f9cd93b0c5eb2f697c7fb3cbb2b629e43b919 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Wed, 26 Jan 2022 11:19:10 -0800 Subject: [PATCH 1/8] Test CI From 5d902973700f52b4787036a99d9e454bae787983 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Wed, 26 Jan 2022 18:54:18 -0800 Subject: [PATCH 2/8] Exclude fasteners 0.17.3 We seem to be experiencing hangs in `test_sync.py` with this version. So exclude it from testing. --- environment.yml | 2 +- requirements_dev_minimal.txt | 2 +- setup.py | 2 +- windows_conda_dev.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environment.yml b/environment.yml index b47dd9238b..b89205e044 100644 --- a/environment.yml +++ b/environment.yml @@ -8,6 +8,6 @@ dependencies: - pip - pip: - asciitree - - fasteners + - fasteners !=0.17.3 - pytest - setuptools_scm diff --git a/requirements_dev_minimal.txt b/requirements_dev_minimal.txt index 481e51f8fb..9f7c8d2869 100644 --- a/requirements_dev_minimal.txt +++ b/requirements_dev_minimal.txt @@ -1,6 +1,6 @@ # library requirements asciitree==0.3.3 -fasteners==0.17.3 +fasteners==0.17.2 numcodecs==0.9.1 msgpack-python==0.5.6 setuptools-scm==6.4.2 diff --git a/setup.py b/setup.py index a68c77a63f..46c4f2d901 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ dependencies = [ 'asciitree', 'numpy>=1.7', - 'fasteners', + 'fasteners!=0.17.3', 'numcodecs>=0.6.4', ] diff --git a/windows_conda_dev.txt b/windows_conda_dev.txt index 576674827d..9b89f28f4f 100644 --- a/windows_conda_dev.txt +++ b/windows_conda_dev.txt @@ -1,5 +1,5 @@ coverage -fasteners +fasteners !=0.17.3 flake8 monotonic msgpack-python From 262ac90160220099fb53a6b231b99cf61bd22304 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Wed, 26 Jan 2022 22:50:59 -0800 Subject: [PATCH 3/8] Only use fasteners <0.17.2 --- environment.yml | 2 +- setup.py | 2 +- windows_conda_dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index b89205e044..488aa148fb 100644 --- a/environment.yml +++ b/environment.yml @@ -8,6 +8,6 @@ dependencies: - pip - pip: - asciitree - - fasteners !=0.17.3 + - fasteners <0.17.2 - pytest - setuptools_scm diff --git a/setup.py b/setup.py index 46c4f2d901..e92d244d72 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ dependencies = [ 'asciitree', 'numpy>=1.7', - 'fasteners!=0.17.3', + 'fasteners<0.17.2', 'numcodecs>=0.6.4', ] diff --git a/windows_conda_dev.txt b/windows_conda_dev.txt index 9b89f28f4f..b200ee37da 100644 --- a/windows_conda_dev.txt +++ b/windows_conda_dev.txt @@ -1,5 +1,5 @@ coverage -fasteners !=0.17.3 +fasteners <0.17.2 flake8 monotonic msgpack-python From f5b3663cb0de0874dfbe730f99457484149b9ed7 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jan 2022 01:35:02 -0800 Subject: [PATCH 4/8] Fix remaining `fasteners` constraint Co-authored-by: Josh Moore --- 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 9f7c8d2869..799547b140 100644 --- a/requirements_dev_minimal.txt +++ b/requirements_dev_minimal.txt @@ -1,6 +1,6 @@ # library requirements asciitree==0.3.3 -fasteners==0.17.2 +fasteners<0.17.2 numcodecs==0.9.1 msgpack-python==0.5.6 setuptools-scm==6.4.2 From 20f81151de299f19fc0d632f27e940f96fcc6d19 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 28 Jan 2022 00:43:45 -0800 Subject: [PATCH 5/8] Revert back to `fasteners` version `0.17.2` --- environment.yml | 2 +- requirements_dev_minimal.txt | 2 +- setup.py | 2 +- windows_conda_dev.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environment.yml b/environment.yml index 488aa148fb..b89205e044 100644 --- a/environment.yml +++ b/environment.yml @@ -8,6 +8,6 @@ dependencies: - pip - pip: - asciitree - - fasteners <0.17.2 + - fasteners !=0.17.3 - pytest - setuptools_scm diff --git a/requirements_dev_minimal.txt b/requirements_dev_minimal.txt index 799547b140..9f7c8d2869 100644 --- a/requirements_dev_minimal.txt +++ b/requirements_dev_minimal.txt @@ -1,6 +1,6 @@ # library requirements asciitree==0.3.3 -fasteners<0.17.2 +fasteners==0.17.2 numcodecs==0.9.1 msgpack-python==0.5.6 setuptools-scm==6.4.2 diff --git a/setup.py b/setup.py index e92d244d72..46c4f2d901 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ dependencies = [ 'asciitree', 'numpy>=1.7', - 'fasteners<0.17.2', + 'fasteners!=0.17.3', 'numcodecs>=0.6.4', ] diff --git a/windows_conda_dev.txt b/windows_conda_dev.txt index b200ee37da..9b89f28f4f 100644 --- a/windows_conda_dev.txt +++ b/windows_conda_dev.txt @@ -1,5 +1,5 @@ coverage -fasteners <0.17.2 +fasteners !=0.17.3 flake8 monotonic msgpack-python From 24039e8dda983ff1c43e6bc9c8422c7b2d5841b9 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 28 Jan 2022 00:47:14 -0800 Subject: [PATCH 6/8] Use `fasteners` pre-`0.17` --- environment.yml | 2 +- requirements_dev_minimal.txt | 2 +- setup.py | 2 +- windows_conda_dev.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environment.yml b/environment.yml index b89205e044..8452cbbb7e 100644 --- a/environment.yml +++ b/environment.yml @@ -8,6 +8,6 @@ dependencies: - pip - pip: - asciitree - - fasteners !=0.17.3 + - fasteners <0.17 - pytest - setuptools_scm diff --git a/requirements_dev_minimal.txt b/requirements_dev_minimal.txt index 9f7c8d2869..a7945d2175 100644 --- a/requirements_dev_minimal.txt +++ b/requirements_dev_minimal.txt @@ -1,6 +1,6 @@ # library requirements asciitree==0.3.3 -fasteners==0.17.2 +fasteners<0.17 numcodecs==0.9.1 msgpack-python==0.5.6 setuptools-scm==6.4.2 diff --git a/setup.py b/setup.py index 46c4f2d901..f853db10e0 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ dependencies = [ 'asciitree', 'numpy>=1.7', - 'fasteners!=0.17.3', + 'fasteners<0.17', 'numcodecs>=0.6.4', ] diff --git a/windows_conda_dev.txt b/windows_conda_dev.txt index 9b89f28f4f..a62f11bee2 100644 --- a/windows_conda_dev.txt +++ b/windows_conda_dev.txt @@ -1,5 +1,5 @@ coverage -fasteners !=0.17.3 +fasteners <0.17 flake8 monotonic msgpack-python From ea83d9312f829466ea3cdb1ceb4c486768357d9b Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 28 Jan 2022 01:26:53 -0800 Subject: [PATCH 7/8] Max pytest verbosity --- .github/workflows/minimal.yml | 4 ++-- .github/workflows/python-package.yml | 2 +- .github/workflows/windows-testing.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml index 90c9a59585..1fd5ebb7cd 100644 --- a/.github/workflows/minimal.yml +++ b/.github/workflows/minimal.yml @@ -25,11 +25,11 @@ jobs: run: | conda activate minimal python -m pip install . - pytest -svx + pytest -svvvx - name: Fixture generation shell: "bash -l {0}" run: | conda activate minimal rm -rf fixture/ - pytest -svx zarr/tests/test_dim_separator.py zarr/tests/test_storage.py + pytest -svvvx zarr/tests/test_dim_separator.py zarr/tests/test_storage.py # This simulates fixture-less tests in conda and debian packaging diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 0c44de8b1f..da3052ae90 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -73,7 +73,7 @@ jobs: conda activate zarr-env mkdir ~/blob_emulator azurite -l ~/blob_emulator --debug debug.log 2>&1 > stdouterr.log & - pytest --cov=zarr --cov-config=.coveragerc --doctest-plus --cov-report xml --cov=./ + pytest -vvv --cov=zarr --cov-config=.coveragerc --doctest-plus --cov-report xml --cov=./ - uses: codecov/codecov-action@v1 with: #token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos diff --git a/.github/workflows/windows-testing.yml b/.github/workflows/windows-testing.yml index af656aa88d..8abcce1dd1 100644 --- a/.github/workflows/windows-testing.yml +++ b/.github/workflows/windows-testing.yml @@ -48,7 +48,7 @@ jobs: conda activate zarr-env mkdir ~/blob_emulator azurite -l ~/blob_emulator --debug debug.log 2>&1 > stdouterr.log & - pytest -sv --timeout=300 + pytest -svvv --timeout=300 env: ZARR_TEST_ABS: 1 - name: Conda info From d9d579c1c4829468eb9efd8db367366e76bf71cf Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 4 Feb 2022 01:05:16 -0800 Subject: [PATCH 8/8] Revert all changes and retest CI --- .github/workflows/minimal.yml | 4 ++-- .github/workflows/python-package.yml | 2 +- .github/workflows/windows-testing.yml | 2 +- environment.yml | 2 +- requirements_dev_minimal.txt | 2 +- setup.py | 2 +- windows_conda_dev.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml index 1fd5ebb7cd..90c9a59585 100644 --- a/.github/workflows/minimal.yml +++ b/.github/workflows/minimal.yml @@ -25,11 +25,11 @@ jobs: run: | conda activate minimal python -m pip install . - pytest -svvvx + pytest -svx - name: Fixture generation shell: "bash -l {0}" run: | conda activate minimal rm -rf fixture/ - pytest -svvvx zarr/tests/test_dim_separator.py zarr/tests/test_storage.py + pytest -svx zarr/tests/test_dim_separator.py zarr/tests/test_storage.py # This simulates fixture-less tests in conda and debian packaging diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index da3052ae90..0c44de8b1f 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -73,7 +73,7 @@ jobs: conda activate zarr-env mkdir ~/blob_emulator azurite -l ~/blob_emulator --debug debug.log 2>&1 > stdouterr.log & - pytest -vvv --cov=zarr --cov-config=.coveragerc --doctest-plus --cov-report xml --cov=./ + pytest --cov=zarr --cov-config=.coveragerc --doctest-plus --cov-report xml --cov=./ - uses: codecov/codecov-action@v1 with: #token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos diff --git a/.github/workflows/windows-testing.yml b/.github/workflows/windows-testing.yml index 8abcce1dd1..af656aa88d 100644 --- a/.github/workflows/windows-testing.yml +++ b/.github/workflows/windows-testing.yml @@ -48,7 +48,7 @@ jobs: conda activate zarr-env mkdir ~/blob_emulator azurite -l ~/blob_emulator --debug debug.log 2>&1 > stdouterr.log & - pytest -svvv --timeout=300 + pytest -sv --timeout=300 env: ZARR_TEST_ABS: 1 - name: Conda info diff --git a/environment.yml b/environment.yml index 8452cbbb7e..b47dd9238b 100644 --- a/environment.yml +++ b/environment.yml @@ -8,6 +8,6 @@ dependencies: - pip - pip: - asciitree - - fasteners <0.17 + - fasteners - pytest - setuptools_scm diff --git a/requirements_dev_minimal.txt b/requirements_dev_minimal.txt index a7945d2175..481e51f8fb 100644 --- a/requirements_dev_minimal.txt +++ b/requirements_dev_minimal.txt @@ -1,6 +1,6 @@ # library requirements asciitree==0.3.3 -fasteners<0.17 +fasteners==0.17.3 numcodecs==0.9.1 msgpack-python==0.5.6 setuptools-scm==6.4.2 diff --git a/setup.py b/setup.py index f853db10e0..a68c77a63f 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ dependencies = [ 'asciitree', 'numpy>=1.7', - 'fasteners<0.17', + 'fasteners', 'numcodecs>=0.6.4', ] diff --git a/windows_conda_dev.txt b/windows_conda_dev.txt index a62f11bee2..576674827d 100644 --- a/windows_conda_dev.txt +++ b/windows_conda_dev.txt @@ -1,5 +1,5 @@ coverage -fasteners <0.17 +fasteners flake8 monotonic msgpack-python