Fixes related to sample data updates

.github/workflows/main.yml

@@ -92,7 +92,7 @@ jobs:
     with:
       python-version: '3.13'
       test_extras: tests
-      test_command: pytest --pyargs dkist -k "not test_fail"
+      test_command: pytest --pyargs dkist -k "not test_fail" --remote-data=none
       # We have to work around a github runner bug here: https://github.com/actions/runner/issues/2788#issuecomment-2145922705
       upload_to_pypi: ${{ startsWith(github.ref || format('{0}{1}', 'refs/tags/', github.event.release.tag_name), 'refs/tags/v') && !endsWith(github.ref || format('{0}{1}', 'refs/tags/', github.event.release.tag_name), '.dev') }}
     secrets:

CHANGELOG.rst

@@ -19,7 +19,7 @@ Backwards Incompatible Changes
   * asdf-astropy >= 0.5
   * asdf-coordinate-schemas >= 0.3
   * asdf-transform-schemas >= 0.5
-  * asdf-wcs-schemas >= 0.4 
+  * asdf-wcs-schemas >= 0.4
 
 
 Features

dkist/data/sample.py

@@ -20,8 +20,13 @@
     raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
 
 
-def download_all_sample_data():
+def download_all_sample_data(overwrite=False):
     """
     Download all sample data at once that has not already been downloaded.
+
+    Parameters
+    ----------
+    overwrite : `bool`
+        Re-download and overwrite any existing files.
     """
-    return _get_sample_datasets(_SAMPLE_DATASETS.keys())
+    return _get_sample_datasets(_SAMPLE_DATASETS.keys(), force_download=not overwrite)

docs/examples/reproject_vbi_mosaic.md

@@ -44,7 +44,7 @@ If you want to replace this dataset with your own dataset, see {ref}`dkist:howto
 Let's load the data with {obj}`dkist.load_dataset`:
 
 ```{code-cell} ipython3
-ds = dkist.load_dataset(VBI_AJQWW / "VBI_L1_20231016T184519_AJQWW.asdf")
+ds = dkist.load_dataset(VBI_AJQWW)
 ds
 ```
 

pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
   # files with them unpinned so they are now required to read generated asdf
   # files.
   "asdf>=3.3.0",  # Required by gwcs 0.24
-  "asdf-astropy>=0.5.0",  # Required by gwcs 0.24
+  "asdf-astropy>=0.5.0,!=0.7.0",  # Required by gwcs 0.24
   "asdf-coordinates-schemas>=0.3.0",  # required by wcs-schemas 0.4
   "asdf-standard>=1.1.0",
   "asdf-transform-schemas>=0.5.0",  # required by wcs-schemas 0.4

tools/update_sample_data.py

@@ -45,7 +45,7 @@ def main(datasets, working_directory, destination_path="/user_tools_tutorial_dat
 
     for did, props in datasets.items():
         res = Fido.search(a.dkist.Dataset(did))
-        asdf_file = Fido.fetch(res, path=working_directory / "{dataset_id}", progress=False, overwrite=False)
+        asdf_file = Fido.fetch(res, path=working_directory / "{dataset_id}", progress=False, overwrite=True)
 
         ds = dkist.load_dataset(asdf_file)
         if "slice" in props:
@@ -64,10 +64,12 @@ def main(datasets, working_directory, destination_path="/user_tools_tutorial_dat
         [f.unlink() for f in dataset_path.glob("*.mp4")]
         [f.unlink() for f in dataset_path.glob("*.pdf")]
         assert len(list(dataset_path.glob("*.asdf"))) == 1
+        dataset_files = tuple(dataset_path.glob("*"))
 
         sample_filename = working_directory / props["filename"]
         with tarfile.open(sample_filename, mode="w") as tfile:
-            tfile.add(dataset_path, recursive=True)
+            for dfile in dataset_files:
+                tfile.add(dfile, arcname=dfile.name, recursive=False)
 
         sample_files_for_upload.append(sample_filename)