From 65ca6e586c57d2914df31454d5848e585071b337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A9drine?= Date: Thu, 4 May 2023 15:37:54 +0200 Subject: [PATCH] Other fixes --- tests/conftest.py | 32 +++++++++++++---------------- tests/snapshots/snapshot_invprob.py | 6 +++--- tests/snapshots/snapshot_psfsub.py | 6 +++--- tests/test_preproc_recentering.py | 8 ++------ 4 files changed, 22 insertions(+), 30 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index e05a276b..b0e1e47e 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -33,11 +33,9 @@ def example_dataset_adi(): url_prefix = "https://github.com/vortex-exoplanet/VIP_extras/raw/master/datasets" - f1 = download_resource( - "{}/naco_betapic_cube_cen.fits".format(url_prefix), cache=True - ) - f2 = download_resource("{}/naco_betapic_psf.fits".format(url_prefix), cache=True) - f3 = download_resource("{}/naco_betapic_pa.fits".format(url_prefix), cache=True) + f1 = download_resource("{}/naco_betapic_cube_cen.fits".format(url_prefix)) + f2 = download_resource("{}/naco_betapic_psf.fits".format(url_prefix)) + f3 = download_resource("{}/naco_betapic_pa.fits".format(url_prefix)) # load fits cube = vip.fits.open_fits(f1) @@ -103,10 +101,10 @@ def example_dataset_ifs(): url_prefix = "https://github.com/vortex-exoplanet/VIP_extras/raw/master/datasets" - f1 = download_resource("{}/sphere_v471tau_cube.fits".format(url_prefix), cache=True) - f2 = download_resource("{}/sphere_v471tau_psf.fits".format(url_prefix), cache=True) - f3 = download_resource("{}/sphere_v471tau_pa.fits".format(url_prefix), cache=True) - f4 = download_resource("{}/sphere_v471tau_wl.fits".format(url_prefix), cache=True) + f1 = download_resource("{}/sphere_v471tau_cube.fits".format(url_prefix)) + f2 = download_resource("{}/sphere_v471tau_psf.fits".format(url_prefix)) + f3 = download_resource("{}/sphere_v471tau_pa.fits".format(url_prefix)) + f4 = download_resource("{}/sphere_v471tau_wl.fits".format(url_prefix)) # load fits cube = vip.fits.open_fits(f1) @@ -155,10 +153,10 @@ def example_dataset_ifs_crop(): url_prefix = "https://github.com/vortex-exoplanet/VIP_extras/raw/master/datasets" - f1 = download_resource("{}/sphere_v471tau_cube.fits".format(url_prefix), cache=True) - f2 = download_resource("{}/sphere_v471tau_psf.fits".format(url_prefix), cache=True) - f3 = download_resource("{}/sphere_v471tau_pa.fits".format(url_prefix), cache=True) - f4 = download_resource("{}/sphere_v471tau_wl.fits".format(url_prefix), cache=True) + f1 = download_resource("{}/sphere_v471tau_cube.fits".format(url_prefix)) + f2 = download_resource("{}/sphere_v471tau_psf.fits".format(url_prefix)) + f3 = download_resource("{}/sphere_v471tau_pa.fits".format(url_prefix)) + f4 = download_resource("{}/sphere_v471tau_wl.fits".format(url_prefix)) # load fits cube = vip.fits.open_fits(f1) @@ -209,11 +207,9 @@ def example_dataset_rdi(): url_prefix = "https://github.com/vortex-exoplanet/VIP_extras/raw/master/datasets" - f1 = download_resource( - "{}/naco_betapic_cube_cen.fits".format(url_prefix), cache=True - ) - f2 = download_resource("{}/naco_betapic_psf.fits".format(url_prefix), cache=True) - f3 = download_resource("{}/naco_betapic_pa.fits".format(url_prefix), cache=True) + f1 = download_resource("{}/naco_betapic_cube_cen.fits".format(url_prefix)) + f2 = download_resource("{}/naco_betapic_psf.fits".format(url_prefix)) + f3 = download_resource("{}/naco_betapic_pa.fits".format(url_prefix)) # load fits cube = vip.fits.open_fits(f1) diff --git a/tests/snapshots/snapshot_invprob.py b/tests/snapshots/snapshot_invprob.py index 55c9f2f5..5128b6f2 100644 --- a/tests/snapshots/snapshot_invprob.py +++ b/tests/snapshots/snapshot_invprob.py @@ -39,9 +39,9 @@ def make_dataset_adi(): url_prefix = "https://github.com/vortex-exoplanet/VIP_extras/raw/master/datasets" - f1 = download_resource(f"{url_prefix}/naco_betapic_cube_cen.fits", cache=True) - f2 = download_resource(f"{url_prefix}/naco_betapic_psf.fits", cache=True) - f3 = download_resource(f"{url_prefix}/naco_betapic_pa.fits", cache=True) + f1 = download_resource(f"{url_prefix}/naco_betapic_cube_cen.fits") + f2 = download_resource(f"{url_prefix}/naco_betapic_psf.fits") + f3 = download_resource(f"{url_prefix}/naco_betapic_pa.fits") # load fits cube = open_fits(f1) diff --git a/tests/snapshots/snapshot_psfsub.py b/tests/snapshots/snapshot_psfsub.py index 438cc108..e8f74843 100644 --- a/tests/snapshots/snapshot_psfsub.py +++ b/tests/snapshots/snapshot_psfsub.py @@ -38,9 +38,9 @@ def make_dataset_adi(): url_prefix = "https://github.com/vortex-exoplanet/VIP_extras/raw/master/datasets" - f1 = download_resource(f"{url_prefix}/naco_betapic_cube_cen.fits", cache=True) - f2 = download_resource(f"{url_prefix}/naco_betapic_psf.fits", cache=True) - f3 = download_resource(f"{url_prefix}/naco_betapic_pa.fits", cache=True) + f1 = download_resource(f"{url_prefix}/naco_betapic_cube_cen.fits") + f2 = download_resource(f"{url_prefix}/naco_betapic_psf.fits") + f3 = download_resource(f"{url_prefix}/naco_betapic_pa.fits") # load fits cube = open_fits(f1) diff --git a/tests/test_preproc_recentering.py b/tests/test_preproc_recentering.py index 486e8fd3..2a0fb151 100644 --- a/tests/test_preproc_recentering.py +++ b/tests/test_preproc_recentering.py @@ -614,12 +614,8 @@ def test_radon(debug=False): # ===== datacube url_prefix = "https://github.com/vortex-exoplanet/VIP_extras/raw/master/datasets" - f1 = download_resource( - "{}/sphere_ifs_PDS70_cen.fits".format(url_prefix), cache=True - ) - f2 = download_resource( - "{}/sphere_ifs_PDS70_psf.fits".format(url_prefix), cache=True - ) + f1 = download_resource("{}/sphere_ifs_PDS70_cen.fits".format(url_prefix)) + f2 = download_resource("{}/sphere_ifs_PDS70_psf.fits".format(url_prefix)) # load fits cube = vip.fits.open_fits(f1)