From 2cee06ede36b925da6f005dbc4b38f82f659e846 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 4 Nov 2020 10:26:21 -0500 Subject: [PATCH 1/3] Restrict h5py to pre-3.0 in order to not break tests --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index b17a11fca..e860b72ca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -41,6 +41,7 @@ install_requires = email-validator etelemetry >= 0.2.0 fasteners + h5py ~= 2.9 joblib pydantic pyout != 0.6.0 From b6635a9f86588afac292d2004bde61d34b26e4de Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 4 Nov 2020 11:08:03 -0500 Subject: [PATCH 2/3] Mark publish.dandiarchive.org tests as xfailing --- dandi/tests/test_download.py | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dandi/tests/test_download.py b/dandi/tests/test_download.py index e22ce59d3..b6d4e907d 100644 --- a/dandi/tests/test_download.py +++ b/dandi/tests/test_download.py @@ -72,7 +72,10 @@ def sleep(duration): @pytest.mark.parametrize( "url", [ # Should go through API - "https://dandiarchive.org/dandiset/000027/0.200721.2222", + pytest.param( + "https://dandiarchive.org/dandiset/000027/0.200721.2222", + marks=pytest.mark.xfail(reason="publish.dandiarchive.org is gone"), + ), # Drafts do not go through API ATM, but that should not be visible to user "https://dandiarchive.org/dandiset/000027/draft", ], @@ -107,7 +110,10 @@ def test_download_000027(url, tmpdir): @pytest.mark.parametrize( "url", [ # Should go through API - "https://dandiarchive.org/dandiset/000027/0.200721.2222", + pytest.param( + "https://dandiarchive.org/dandiset/000027/0.200721.2222", + marks=pytest.mark.xfail(reason="publish.dandiarchive.org is gone"), + ), # Drafts do not go through API ATM, but that should not be visible to user "https://dandiarchive.org/dandiset/000027/draft", ], @@ -123,7 +129,10 @@ def test_download_000027_metadata_only(url, tmpdir): @pytest.mark.parametrize( "url", [ # Should go through API - "https://dandiarchive.org/dandiset/000027/0.200721.2222", + pytest.param( + "https://dandiarchive.org/dandiset/000027/0.200721.2222", + marks=pytest.mark.xfail(reason="publish.dandiarchive.org is gone"), + ), # Drafts do not go through API ATM, but that should not be visible to user "https://dandiarchive.org/dandiset/000027/draft", ], @@ -148,7 +157,16 @@ def raise_assertion_error(*args, **kwargs): @pytest.mark.parametrize("resizer", [lambda sz: 0, lambda sz: sz // 2, lambda sz: sz]) -@pytest.mark.parametrize("version", ["0.200721.2222", "draft"]) +@pytest.mark.parametrize( + "version", + [ + pytest.param( + "0.200721.2222", + marks=pytest.mark.xfail(reason="publish.dandiarchive.org is gone"), + ), + "draft", + ], +) def test_download_000027_resume(tmp_path, resizer, version): from ..support.digests import Digester From 41d8b05a2bcdb4b65c544be89ca76f987c51ad89 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 4 Nov 2020 11:14:12 -0500 Subject: [PATCH 3/3] Mention h5py version restriction in CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c36cba8e4..cb5e1cbc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Moved code for navigating Dandi Archive into new `dandiarchive` submodule - YAML output now sorts keys - `dandiset.yaml` is no longer uploaded to the archive +- Restrict h5py dependency to pre-v3.0 ## [0.6.4] - 2020-09-04