From a76bc16166897ced5e6672d6f2918b9785761ff7 Mon Sep 17 00:00:00 2001 From: Jeff Jennings Date: Tue, 31 Oct 2023 16:23:54 -0400 Subject: [PATCH 1/3] conftest: set new zenodo version --- test/conftest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 2686b89c..2b6fc451 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -4,23 +4,23 @@ from mpol import coordinates, gridding +zenodo_version = 10059491 + # We need a fixture which provides mock visibilities of the sort we'd # expect from visread, but *without* the CASA dependency. # fixture to provide tuple of uu, vv, weight, data_re, and data_im values @pytest.fixture(scope="session") def mock_visibility_archive(): - # use astropy routines to cache data fname = download_file( - "https://zenodo.org/record/4930016/files/logo_cube.noise.npz", + "https://zenodo.org/record/{:d}/files/logo_cube.noise.npz".format(zenodo_version), cache=True, pkgname="mpol", ) return np.load(fname) - @pytest.fixture def mock_visibility_data(mock_visibility_archive): d = mock_visibility_archive From 503503c30e107b0a47820b28333a9ffe89463b2a Mon Sep 17 00:00:00 2001 From: Jeff Jennings Date: Tue, 31 Oct 2023 16:25:00 -0400 Subject: [PATCH 2/3] download_external_files: new zenodo version --- docs/download_external_files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/download_external_files.py b/docs/download_external_files.py index 1f8f634f..304e7f51 100644 --- a/docs/download_external_files.py +++ b/docs/download_external_files.py @@ -1,6 +1,6 @@ from astropy.utils.data import download_file -version = 4930016 +version = 10059491 slug = "https://zenodo.org/record/{:d}/files/{:}" fnames = [ From ccfcbbcf3629c2bd983b0450d5cccab7419b42c1 Mon Sep 17 00:00:00 2001 From: Jeff Jennings Date: Tue, 31 Oct 2023 16:27:43 -0400 Subject: [PATCH 3/3] tutorials: update zenodo version --- docs/ci-tutorials/crossvalidation.md | 4 ++-- docs/ci-tutorials/fakedata.md | 2 +- docs/ci-tutorials/gridder.md | 2 +- docs/ci-tutorials/initializedirtyimage.md | 2 +- docs/ci-tutorials/loose-visibilities.md | 2 +- docs/ci-tutorials/optimization.md | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/ci-tutorials/crossvalidation.md b/docs/ci-tutorials/crossvalidation.md index dd4f0ed1..baf0f3e6 100644 --- a/docs/ci-tutorials/crossvalidation.md +++ b/docs/ci-tutorials/crossvalidation.md @@ -51,7 +51,7 @@ from mpol import ( # load the mock dataset of the ALMA logo fname = download_file( - "https://zenodo.org/record/4930016/files/logo_cube.noise.npz", + "https://zenodo.org/record/10059491/files/logo_cube.noise.npz", cache=True, show_progress=True, pkgname="mpol", @@ -361,7 +361,7 @@ For the purposes of comparison, here is the image produced by the tclean algorit ```{code-cell} fname = download_file( - "https://zenodo.org/record/4930016/files/logo_cube.tclean.fits", + "https://zenodo.org/record/10059491/files/logo_cube.tclean.fits", cache=True, show_progress=True, pkgname="mpol", diff --git a/docs/ci-tutorials/fakedata.md b/docs/ci-tutorials/fakedata.md index 0e3a948e..de08ef3d 100644 --- a/docs/ci-tutorials/fakedata.md +++ b/docs/ci-tutorials/fakedata.md @@ -274,7 +274,7 @@ from astropy.utils.data import download_file # load the mock dataset of the ALMA logo fname = download_file( - "https://zenodo.org/record/4930016/files/logo_cube.noise.npz", + "https://zenodo.org/record/10059491/files/logo_cube.noise.npz", cache=True, show_progress=True, pkgname="mpol", diff --git a/docs/ci-tutorials/gridder.md b/docs/ci-tutorials/gridder.md index 8e7607dc..47ffaf3d 100644 --- a/docs/ci-tutorials/gridder.md +++ b/docs/ci-tutorials/gridder.md @@ -39,7 +39,7 @@ from astropy.utils.data import download_file ```{code-cell} # load the mock dataset of the ALMA logo fname = download_file( - "https://zenodo.org/record/4930016/files/logo_cube.noise.npz", + "https://zenodo.org/record/10059491/files/logo_cube.noise.npz", cache=True, show_progress=True, pkgname="mpol", diff --git a/docs/ci-tutorials/initializedirtyimage.md b/docs/ci-tutorials/initializedirtyimage.md index 1857f815..e4c1b041 100644 --- a/docs/ci-tutorials/initializedirtyimage.md +++ b/docs/ci-tutorials/initializedirtyimage.md @@ -47,7 +47,7 @@ When saving and loading a model, it is important to make sure that ``cell_size`` ```{code-cell} # load the mock dataset of the ALMA logo fname = download_file( - "https://zenodo.org/record/4930016/files/logo_cube.noise.npz", + "https://zenodo.org/record/10059491/files/logo_cube.noise.npz", cache=True, show_progress=True, pkgname="mpol", diff --git a/docs/ci-tutorials/loose-visibilities.md b/docs/ci-tutorials/loose-visibilities.md index a39dea62..aed73b3b 100644 --- a/docs/ci-tutorials/loose-visibilities.md +++ b/docs/ci-tutorials/loose-visibilities.md @@ -49,7 +49,7 @@ and loading the dataset ```{code-cell} # load the mock dataset of the ALMA logo fname = download_file( - "https://zenodo.org/record/4930016/files/logo_cube.noise.npz", + "https://zenodo.org/record/10059491/files/logo_cube.noise.npz", cache=True, show_progress=True, pkgname="mpol", diff --git a/docs/ci-tutorials/optimization.md b/docs/ci-tutorials/optimization.md index caf72e1b..0a7b8686 100644 --- a/docs/ci-tutorials/optimization.md +++ b/docs/ci-tutorials/optimization.md @@ -40,7 +40,7 @@ from mpol import coordinates, fourier, gridding, losses, precomposed, utils ```{code-cell} ipython3 # load the mock dataset of the ALMA logo fname = download_file( - "https://zenodo.org/record/4930016/files/logo_cube.noise.npz", + "https://zenodo.org/record/10059491/files/logo_cube.noise.npz", cache=True, show_progress=True, pkgname="mpol",