dkist 1.6.0__tar.gz → 1.7.0__tar.gz

{dkist-1.6.0 → dkist-1.7.0}/.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sunpy/package-template",
-  "commit": "6d6729b22066ef890e70c37438da70cac33e03b4",
+  "commit": "4721cdbdc9577fbf66f5e0f30fd4133a7723aeb9",
   "checkout": null,
   "context": {
     "cookiecutter": {

{dkist-1.6.0 → dkist-1.7.0}/.github/workflows/codspeed.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
-      - run: python -m pip install .[tests] pytest-codspeed
+      - run: python -m pip install .[tests] pytest-codspeed 'numpy<2'
       - name: Run benchmarks
         uses: CodspeedHQ/action@v2
         with:

{dkist-1.6.0 → dkist-1.7.0}/.github/workflows/prepare-release.yml

@@ -60,7 +60,7 @@ jobs:
 
       - name: Update attrs
         run: |
-          python -c "from dkist.net.attrs_values import attempt_local_update; attempt_local_update(user_file='./dkist/data/api_search_values.json', silence_errors=False)"
+          python -c "from dkist.net.attrs_values import attempt_local_update; attempt_local_update(user_file='./dkist/data/api_search_values.json', silence_net_errors=False)"
 
       - name: Commit Attrs
         run: |
@@ -128,14 +128,17 @@ jobs:
       - name: Create draft GitHub Release
         uses: actions/github-script@v7
         id: create-release
+        env:
+            RELEASE_BODY: "${{ steps.markdown-changelog.outputs.content }}"
         with:
           script: |
+            const { RELEASE_BODY } = process.env
             return await github.rest.repos.createRelease({
               owner: context.repo.owner,
               repo: context.repo.repo,
               tag_name: "v${{ inputs.version }}",
               name: "v${{ inputs.version }}",
-              body: `${{ steps.markdown-changelog.outputs.content }}`,
+              body: `${RELEASE_BODY}`,
               draft: true,
               prerelease: ${{ inputs.pre_release }}
             });

{dkist-1.6.0 → dkist-1.7.0}/.github/workflows/sub_package_update.yml

@@ -28,11 +28,6 @@ jobs:
             branch: cruft/update
             commit-message: "Automatic package template update"
             title: Updates from the package template
-          - add-paths: .cruft.json
-            body: reject these changes for this repo.
-            branch: cruft/reject
-            commit-message: "Reject this package template update"
-            title: Reject new updates from package template
 
     steps:
       - uses: actions/checkout@v4
@@ -42,7 +37,7 @@ jobs:
           python-version: "3.11"
 
       - name: Install Cruft
-        run: python -m pip install cruft
+        run: python -m pip install git+https://github.com/Cadair/cruft@patch-p1
 
       - name: Check if update is available
         continue-on-error: false

{dkist-1.6.0 → dkist-1.7.0}/.gitignore

@@ -76,6 +76,7 @@ instance/
 docs/_build/
 # automodapi
 docs/api
+docs/sg_execution_times.rst
 
 # PyBuilder
 .pybuilder/

{dkist-1.6.0 → dkist-1.7.0}/.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
     # This should be before any formatting hooks like isort
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.3.5"
+    rev: "v0.5.0"
     hooks:
       - id: ruff
         args: ["--fix"]
@@ -26,10 +26,10 @@ repos:
       - id: mixed-line-ending
         exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|.asdf|.json|.hdr)$"
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
         args: [ "--write-changes", "-D", "-", "-D", ".codespell-dict.txt"]
 ci:
   autofix_prs: false
-  autoupdate_schedule: "weekly"
+  autoupdate_schedule: "quarterly"

{dkist-1.6.0 → dkist-1.7.0}/CHANGELOG.rst

@@ -1,3 +1,18 @@
+1.7.0 (2024-07-11)
+==================
+
+Features
+--------
+
+- Add "status" to the list of know dataset inventory fields. (`#417 <https://github.com/DKISTDC/dkist/pull/417>`_)
+
+
+Bug Fixes
+---------
+
+- Catch URLError when trying to download attr values in tests so that the existing file isn't assumed to be corrupted and therefore deleted. (`#407 <https://github.com/DKISTDC/dkist/pull/407>`_)
+
+
 1.6.0 (2024-05-20)
 ==================
 
@@ -378,7 +393,7 @@ Bug Fixes
 Trivial/Internal Changes
 ------------------------
 
-- Migate to the asdf 2.8+ ``Converter`` interface, this bumps various
+- Migrate to the asdf 2.8+ ``Converter`` interface, this bumps various
   dependencies but should have no effect on reading or writing asdf files. (`#152 <https://github.com/DKISTDC/dkist/pull/152>`_)
 
 

{dkist-1.6.0/dkist.egg-info → dkist-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist
-Version: 1.6.0
+Version: 1.7.0
 Summary: DKIST User Tools
 Author-email: NSO / AURA <stuart@cadair.com>
 Project-URL: repository, https://github.com/DKISTDC/dkist
@@ -30,12 +30,12 @@ Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-doctestplus; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-remotedata; extra == "tests"
-Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-mock; extra == "tests"
 Requires-Dist: pytest-mpl; extra == "tests"
 Requires-Dist: pytest-httpserver; extra == "tests"
 Requires-Dist: pytest-filter-subpackage; extra == "tests"
 Requires-Dist: pytest-benchmark; extra == "tests"
+Requires-Dist: pytest-xdist; extra == "tests"
 Requires-Dist: hypothesis; extra == "tests"
 Requires-Dist: tox; extra == "tests"
 Requires-Dist: pydot; extra == "tests"

{dkist-1.6.0 → dkist-1.7.0}/dkist/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.0'
-__version_tuple__ = version_tuple = (1, 6, 0)
+__version__ = version = '1.7.0'
+__version_tuple__ = version_tuple = (1, 7, 0)

dkist-1.7.0/dkist/data/api_search_values.json

@@ -0,0 +1 @@
+{"parameterValues":[{"parameterName":"createDateMin","values":{"minValue":"2022-12-08T19:07:55.038280","maxValue":"2024-07-10T01:57:31.871849"}},{"parameterName":"createDateMax","values":{"minValue":"2022-12-08T19:07:55.038280","maxValue":"2024-07-10T01:57:31.871849"}},{"parameterName":"endTimeMin","values":{"minValue":"2022-02-23T20:48:55.393500","maxValue":"2024-06-27T17:38:39.129000"}},{"parameterName":"endTimeMax","values":{"minValue":"2022-02-23T20:48:55.393500","maxValue":"2024-06-27T17:38:39.129000"}},{"parameterName":"exposureTimeMin","values":{"minValue":0.037,"maxValue":1380.2332394366197}},{"parameterName":"exposureTimeMax","values":{"minValue":0.037,"maxValue":1380.2332394366197}},{"parameterName":"instrumentNames","values":{"categoricalValues":["VISP","VBI"]}},{"parameterName":"qualityAverageFriedParameterMin","values":{"minValue":0.01695005847191685,"maxValue":2.6520787500175156e+30}},{"parameterName":"qualityAverageFriedParameterMax","values":{"minValue":0.01695005847191685,"maxValue":2.6520787500175156e+30}},{"parameterName":"qualityAveragePolarimetricAccuracyMin","values":{"minValue":0.7510039715379637,"maxValue":1.3227079486518465}},{"parameterName":"qualityAveragePolarimetricAccuracyMax","values":{"minValue":0.7510039715379637,"maxValue":1.3227079486518465}},{"parameterName":"startTimeMin","values":{"minValue":"2022-02-23T19:05:32.338002","maxValue":"2024-06-27T17:28:18.528000"}},{"parameterName":"startTimeMax","values":{"minValue":"2022-02-23T19:05:32.338002","maxValue":"2024-06-27T17:28:18.528000"}},{"parameterName":"targetTypes","values":{"categoricalValues":["coronalhole","sunspot","spicules","quietsun","plages","unknown","filament"]}},{"parameterName":"averageDatasetSpectralSamplingMin","values":{"minValue":0.000540156130946172,"maxValue":0.002011144047143148}},{"parameterName":"averageDatasetSpectralSamplingMax","values":{"minValue":0.000540156130946172,"maxValue":0.002011144047143148}},{"parameterName":"averageDatasetSpatialSamplingMin","values":{"minValue":0.0,"maxValue":12388.04306084}},{"parameterName":"averageDatasetSpatialSamplingMax","values":{"minValue":0.0,"maxValue":12388.04306084}},{"parameterName":"averageDatasetTemporalSamplingMin","values":{"minValue":9.139998999987853,"maxValue":5263.145059399399}},{"parameterName":"averageDatasetTemporalSamplingMax","values":{"minValue":9.139998999987853,"maxValue":5263.145059399399}},{"parameterName":"highLevelSoftwareVersion","values":{"categoricalValues":["Alakai_6-0","Alakai_11.1.0","Alakai_8-0","Alakai_7-0","Alakai_10-0","Pono_6.1.5","Pono_2.1.0","Pono_7.0.0","Pono_1.0.0","Alakai_5-1","Pono_3.1.0","Alakai_3-0","Alakai_4-0"]}},{"parameterName":"workflowName","values":{"categoricalValues":["l0_to_l1_visp","l0_to_l1_vbi_summit-calibrated"]}},{"parameterName":"workflowVersion","values":{"categoricalValues":["2.7.4","2.10.3","1.1.7","0.16.0","1.1.10","2.15.0","2.7.2","2.10.15","2.7.0","2.10.1","2.0.2","1.12.1","2.10.12","2.7.3","1.11.1","1.1.5","1.2.1","2.6.1","2.10.13","2.7.5","2.0.1","1.4.8","1.8.2","2.9.0","2.10.7","2.3.1","2.3.0","2.10.0","1.13.0","1.0.0","1.4.11","2.13.1","1.4.1","1.2.0","2.10.2"]}},{"parameterName":"headerDataUnitCreationDateMin","values":{"minValue":"2022-12-08T17:25:51.965000","maxValue":"2024-07-09T20:27:25.260000"}},{"parameterName":"headerDataUnitCreationDateMax","values":{"minValue":"2022-12-08T17:25:51.965000","maxValue":"2024-07-09T20:27:25.260000"}},{"parameterName":"headerVersion","values":{"categoricalValues":["4.3.0","3.6.0","4.0.0","4.1.1","3.3.0","3.0.0","3.4.0","3.9.0","3.5.0","3.7.1","3.8.1","4.2.0"]}}]}

{dkist-1.6.0 → dkist-1.7.0}/dkist/dataset/tests/test_dataset.py

@@ -65,16 +65,11 @@ def test_wcs_roundtrip_3d(dataset_3d):
     assert_quantity_allclose(p[2], p2[2])
 
 
-def test_dimensions(dataset, dataset_3d):
-    for ds in [dataset, dataset_3d]:
-        assert_quantity_allclose(ds.dimensions, ds.data.shape*u.pix)
-
-
 def test_load_from_directory():
     ds = load_dataset(rootdir / "EIT")
     assert isinstance(ds.data, da.Array)
     assert isinstance(ds.wcs, gwcs.WCS)
-    assert_quantity_allclose(ds.dimensions, (11, 128, 128)*u.pix)
+    assert_quantity_allclose(ds.data.shape, (11, 128, 128))
     assert ds.files.basepath == Path(rootdir / "EIT")
 
 
@@ -99,14 +94,14 @@ def test_load_with_old_methods():
         ds = Dataset.from_directory(rootdir / "EIT")
         assert isinstance(ds.data, da.Array)
         assert isinstance(ds.wcs, gwcs.WCS)
-        assert_quantity_allclose(ds.dimensions, (11, 128, 128)*u.pix)
+        assert_quantity_allclose(ds.data.shape, (11, 128, 128))
         assert ds.files.basepath == Path(rootdir / "EIT")
 
     with pytest.warns(DKISTDeprecationWarning):
         ds = Dataset.from_asdf(rootdir / "EIT" / "eit_test_dataset.asdf")
         assert isinstance(ds.data, da.Array)
         assert isinstance(ds.wcs, gwcs.WCS)
-        assert_quantity_allclose(ds.dimensions, (11, 128, 128)*u.pix)
+        assert_quantity_allclose(ds.data.shape, (11, 128, 128))
         assert ds.files.basepath == Path(rootdir / "EIT")
 
 

{dkist-1.6.0 → dkist-1.7.0}/dkist/net/attrs.py

@@ -301,10 +301,10 @@ class BoundingBox(_DataAttr):
         bottom_left = bottom_left.transform_to(_Helioprojective(observer="earth"))
         top_right = top_right.transform_to(_Helioprojective(observer="earth"))
 
-        self.hpc_bounding_box_arcsec = ((bottom_left.Tx.to_value(_u.arcsec),
-                                         bottom_left.Ty.to_value(_u.arcsec)),
-                                        (top_right.Tx.to_value(_u.arcsec),
-                                         top_right.Ty.to_value(_u.arcsec)))
+        self.hpc_bounding_box_arcsec = ((float(bottom_left.Tx.to_value(_u.arcsec)),
+                                         float(bottom_left.Ty.to_value(_u.arcsec))),
+                                        (float(top_right.Tx.to_value(_u.arcsec)),
+                                         float(top_right.Ty.to_value(_u.arcsec))))
 
         self.search_type = search
 

{dkist-1.6.0 → dkist-1.7.0}/dkist/net/attrs_values.py

@@ -37,6 +37,12 @@ INVENTORY_ATTR_MAP = {
 }
 
 
+class UserCacheMissing(Exception):
+    """
+    An exception for when we have deleted the user cache.
+    """
+
+
 def _get_file_age(path: Path) -> dt.timedelta:
     last_modified = dt.datetime.fromtimestamp(path.stat().st_mtime)
     now = dt.datetime.now()
@@ -65,15 +71,19 @@ def _get_cached_json() -> list[Path, bool]:
     return return_file, update_needed
 
 
-def _fetch_values_to_file(filepath: Path, *, timeout: int = 1):
+def _fetch_values(timeout: int = 1) -> bytes:
+    """
+    Make a request for new values.
+
+    This is a separate function mostly for mocking it in the tests.
+    """
     data = urllib.request.urlopen(
         net_conf.dataset_endpoint + net_conf.dataset_search_values_path, timeout=timeout
     )
-    with open(filepath, "wb") as f:
-        f.write(data.read())
+    return data.read()
 
 
-def attempt_local_update(*, timeout: int = 1, user_file: Path = None, silence_errors: bool = True) -> bool:
+def attempt_local_update(*, timeout: int = 1, user_file: Path = None, silence_net_errors: bool = True) -> bool:
     """
     Attempt to update the local data copy of the values.
 
@@ -86,8 +96,8 @@ def attempt_local_update(*, timeout: int = 1, user_file: Path = None, silence_er
     user_file
         The file to save the updated attrs JSON to. If `None` platformdirs will
         be used to get the user data path.
-    silence_errors
-        If `True` catch all errors in this function.
+    silence_net_errors
+        If `True` catch all errors caused by downloading new values in this function.
 
     Returns
     -------
@@ -97,37 +107,35 @@ def attempt_local_update(*, timeout: int = 1, user_file: Path = None, silence_er
     if user_file is None:
         user_file = platformdirs.user_data_path("dkist") / "api_search_values.json"
     user_file = Path(user_file)
-    user_file.parent.mkdir(exist_ok=True, parents=True)
+    if not user_file.exists():
+        user_file.parent.mkdir(exist_ok=True, parents=True)
 
     log.info(f"Fetching updated search values for the DKIST client to {user_file}")
 
-    success = False
     try:
-        _fetch_values_to_file(user_file, timeout=timeout)
-        success = True
+        data = _fetch_values(timeout)
     except Exception as err:
-        log.error("Failed to download new attrs values.")
+        log.error("Failed to download new dkist attrs values. attr values for dkist may be outdated.")
         log.debug(str(err))
-        # If an error has occurred then remove the local file so it isn't
-        # corrupted or invalid.
-        user_file.unlink(missing_ok=True)
-        if not silence_errors:
+        if not silence_net_errors:
             raise
+        return False
 
-        return success
-
-    # Test that the file we just saved can be parsed as json
     try:
+        # Save the data
+        with open(user_file, "wb") as f:
+            f.write(data)
+
+        # Test that the file we just saved can be parsed as json
         with open(user_file) as f:
             json.load(f)
-    except Exception:
-        log.error("Downloaded file is not valid JSON.")
-        user_file.unlink(missing_ok=True)
-        if not silence_errors:
-            raise
-        success = False
 
-    return success
+        return True
+
+    except Exception as err:
+        log.error("Downloaded file could not be saved or is not valid JSON, removing cached file.")
+        user_file.unlink(missing_ok=True)
+        raise UserCacheMissing from err
 
 
 def get_search_attrs_values(*, allow_update: bool = True, timeout: int = 1) -> dict:
@@ -152,11 +160,15 @@ def get_search_attrs_values(*, allow_update: bool = True, timeout: int = 1) -> d
     """
     local_path, update_needed = _get_cached_json()
     if allow_update and update_needed:
-        attempt_local_update(timeout=timeout)
+        try:
+            attempt_local_update(timeout=timeout)
+        except UserCacheMissing:
+            # if we have deleted the user cache we must use the file shipped with the package
+            local_path = importlib.resources.files(dkist.data) / "api_search_values.json"
 
     if not update_needed:
-        log.debug("No update to attr values needed.")
-        log.debug("Using attr values from %s", local_path)
+        log.debug("No update to dkist attr values needed.")
+        log.debug("Using dkist attr values from %s", local_path)
 
     with open(local_path) as f:
         search_values = json.load(f)

{dkist-1.6.0 → dkist-1.7.0}/dkist/net/tests/test_attrs_values.py

@@ -5,6 +5,7 @@ import logging
 import datetime
 import importlib
 from platform import system
+from urllib.error import URLError
 
 import platformdirs
 import pytest
@@ -12,7 +13,7 @@ import pytest
 from sunpy.net import attrs as a
 
 import dkist.data
-from dkist.net.attrs_values import (_fetch_values_to_file, _get_cached_json,
+from dkist.net.attrs_values import (UserCacheMissing, _fetch_values, _get_cached_json,
                                     attempt_local_update, get_search_attrs_values)
 
 PACKAGE_FILE = importlib.resources.files(dkist.data) / "api_search_values.json"
@@ -79,31 +80,25 @@ def test_get_cached_json_local_not_quite_out_of_date(tmp_homedir, values_in_home
 
 
 @pytest.mark.remote_data
-def test_fetch_values_to_file(tmp_path):
-    json_file = tmp_path / "api_search_values.json"
-
-    assert json_file.exists() is False
-    _fetch_values_to_file(json_file)
-    assert json_file.exists() is True
+def test_fetch_values_to_file():
+    data = _fetch_values()
+    assert isinstance(data, bytes)
 
-    # Check we can load the file as json and it looks very roughly like what we
-    # would expect from the API response
-    with open(json_file) as f:
-        data = json.load(f)
-    assert "parameterValues" in data.keys()
-    assert isinstance(data["parameterValues"], list)
+    jdata = json.loads(data)
+    assert "parameterValues" in jdata.keys()
+    assert isinstance(jdata["parameterValues"], list)
 
 
-def _local_fetch_values(user_file, *, timeout):
-    user_file.parent.mkdir(parents=True, exist_ok=True)
-    shutil.copy(PACKAGE_FILE, user_file)
+def _local_fetch_values(timeout):
+    with open(PACKAGE_FILE, "rb") as fobj:
+        return fobj.read()
 
 
 def test_attempt_local_update(mocker, tmp_path, caplog_dkist):
     json_file = tmp_path / "api_search_values.json"
-    mocker.patch("dkist.net.attrs_values._fetch_values_to_file",
+    mocker.patch("dkist.net.attrs_values._fetch_values",
                  new_callable=lambda: _local_fetch_values)
-    success = attempt_local_update(user_file=json_file, silence_errors=False)
+    success = attempt_local_update(user_file=json_file, silence_net_errors=False)
     assert success
 
     assert caplog_dkist.record_tuples == [
@@ -116,39 +111,51 @@ def raise_error(*args, **kwargs):
 
 
 def test_attempt_local_update_error_download(mocker, caplog_dkist, tmp_homedir, user_file):
-    mocker.patch("dkist.net.attrs_values._fetch_values_to_file",
+    mocker.patch("dkist.net.attrs_values._fetch_values",
                  side_effect=raise_error)
-    success = attempt_local_update(silence_errors=True)
+    success = attempt_local_update(silence_net_errors=True)
     assert not success
 
     assert caplog_dkist.record_tuples == [
         ("dkist", logging.INFO, f"Fetching updated search values for the DKIST client to {user_file}"),
-        ("dkist", logging.ERROR, "Failed to download new attrs values."),
+        ("dkist", logging.ERROR, "Failed to download new dkist attrs values. attr values for dkist may be outdated."),
     ]
 
     with pytest.raises(ValueError, match="This is a value error"):
-        success = attempt_local_update(silence_errors=False)
+        success = attempt_local_update(silence_net_errors=False)
 
 
-def _definately_not_json(user_file, *, timeout):
-    with open(user_file, "w") as f:
-        f.write("This is not json")
+def _definitely_not_json(timeout):
+    return b"alskdjalskdjaslkdj!!"
 
 
-def test_attempt_local_update_fail_invalid_download(mocker, tmp_path, caplog_dkist):
+def test_attempt_local_update_fail_invalid_json(mocker, user_file, tmp_path, caplog_dkist):
+    # test that the file is removed after
     json_file = tmp_path / "api_search_values.json"
-    mocker.patch("dkist.net.attrs_values._fetch_values_to_file",
-                 new_callable=lambda: _definately_not_json)
-    success = attempt_local_update(user_file=json_file, silence_errors=True)
-    assert not success
+    mocker.patch("dkist.net.attrs_values._fetch_values",
+                 new_callable=lambda: _definitely_not_json)
+    with pytest.raises(UserCacheMissing):
+        success = attempt_local_update(user_file=json_file)
+
+    # File should have been deleted if the update has got as far as returning this error
+    assert not json_file.exists()
+
+
+def test_get_search_attrs_values_fail_invalid_download(mocker, user_file, values_in_home, tmp_path, caplog_dkist):
+    """
+    Given: An existing cache file
+    When: JSON is invalid
+    Then: File is removed, and attr values are still loaded
+    """
+    mocker.patch("dkist.net.attrs_values._fetch_values",
+                 new_callable=lambda: _definitely_not_json)
+    ten_ago = (datetime.datetime.now() - datetime.timedelta(days=10)).timestamp()
+    os.utime(user_file, (ten_ago, ten_ago))
 
-    assert caplog_dkist.record_tuples == [
-        ("dkist", logging.INFO, f"Fetching updated search values for the DKIST client to {json_file}"),
-        ("dkist", logging.ERROR, "Downloaded file is not valid JSON."),
-    ]
+    attr_values = get_search_attrs_values()
+    assert not user_file.exists()
 
-    with pytest.raises(json.JSONDecodeError):
-        success = attempt_local_update(user_file=json_file, silence_errors=False)
+    assert {a.Instrument, a.dkist.HeaderVersion, a.dkist.WorkflowName}.issubset(attr_values.keys())
 
 
 @pytest.mark.parametrize(("user_file", "update_needed", "allow_update", "should_update"), [
@@ -172,3 +179,22 @@ def test_get_search_attrs_values(mocker, caplog_dkist, values_in_home, user_file
     assert isinstance(attr_values, dict)
     # Test that some known attrs are in the result
     assert {a.Instrument, a.dkist.HeaderVersion, a.dkist.WorkflowName}.issubset(attr_values.keys())
+
+
+def _fetch_values_urlerror(*args):
+    raise URLError("it hates you")
+
+
+def test_failed_download(mocker, caplog_dkist, user_file, values_in_home):
+    mock = mocker.patch("dkist.net.attrs_values._fetch_values",
+                        new_callable=lambda: _fetch_values_urlerror)
+
+    ten_ago = (datetime.datetime.now() - datetime.timedelta(days=10)).timestamp()
+    os.utime(user_file, (ten_ago, ten_ago))
+
+    attr_values = get_search_attrs_values(allow_update=True)
+
+    assert caplog_dkist.record_tuples == [
+        ("dkist", logging.INFO, f"Fetching updated search values for the DKIST client to {user_file}"),
+        ("dkist", logging.ERROR, "Failed to download new dkist attrs values. attr values for dkist may be outdated."),
+    ]

{dkist-1.6.0 → dkist-1.7.0}/dkist/utils/inventory.py

@@ -72,12 +72,13 @@ INVENTORY_KEY_MAP: dict[str, str] = DefaultMap(None, {
         "headerVersion": "Header Specification Version",
         "headerDocumentationUrl": "Header Documentation URL",
         "infoUrl": "Info URL",
-        "calibrationDocumentationUrl": "Calibration Documentation URL"
+        "calibrationDocumentationUrl": "Calibration Documentation URL",
+        "status": "Status",
 })
 
 
 def _key_clean(key):
-    key = re.sub("[%s]" % re.escape(string.punctuation), "_", key)
+    key = re.sub(f"[{re.escape(string.punctuation)}]", "_", key)
     key = key.replace(" ", "_")
     key = "".join(char for char in key
                     if char.isidentifier() or char.isnumeric())

{dkist-1.6.0 → dkist-1.7.0/dkist.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist
-Version: 1.6.0
+Version: 1.7.0
 Summary: DKIST User Tools
 Author-email: NSO / AURA <stuart@cadair.com>
 Project-URL: repository, https://github.com/DKISTDC/dkist
@@ -30,12 +30,12 @@ Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-doctestplus; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-remotedata; extra == "tests"
-Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-mock; extra == "tests"
 Requires-Dist: pytest-mpl; extra == "tests"
 Requires-Dist: pytest-httpserver; extra == "tests"
 Requires-Dist: pytest-filter-subpackage; extra == "tests"
 Requires-Dist: pytest-benchmark; extra == "tests"
+Requires-Dist: pytest-xdist; extra == "tests"
 Requires-Dist: hypothesis; extra == "tests"
 Requires-Dist: tox; extra == "tests"
 Requires-Dist: pydot; extra == "tests"

{dkist-1.6.0 → dkist-1.7.0}/dkist.egg-info/requires.txt

@@ -41,6 +41,7 @@ pytest-mpl
 pytest-httpserver
 pytest-filter-subpackage
 pytest-benchmark
+pytest-xdist
 hypothesis
 tox
 pydot

{dkist-1.6.0 → dkist-1.7.0}/pyproject.toml

@@ -48,12 +48,12 @@ tests = [
   "pytest-doctestplus",
   "pytest-cov",
   "pytest-remotedata",
-  "pytest-cov",
   "pytest-mock",
   "pytest-mpl",
   "pytest-httpserver",
   "pytest-filter-subpackage",
   "pytest-benchmark",
+  "pytest-xdist",
   "hypothesis",
   "tox",
   "pydot",
@@ -85,6 +85,7 @@ zip-safe = false
 include-package-data = true
 
 [tool.setuptools.packages.find]
+exclude = ["dkist._dev*"]
 
 [tool.setuptools_scm]
 write_to = "dkist/_version.py"

{dkist-1.6.0 → dkist-1.7.0}/pytest.ini

@@ -14,17 +14,23 @@ norecursedirs =
     .history
     dkist/extern
 doctest_plus = enabled
-doctest_optionflags = NORMALIZE_WHITESPACE FLOAT_CMP ELLIPSIS
+doctest_optionflags =
+    NORMALIZE_WHITESPACE
+    FLOAT_CMP
+    ELLIPSIS
 text_file_format = rst
-addopts = --doctest-rst  -p no:unraisableexception -p no:threadexception
-markers =
-    online: marks this test function as needing online connectivity.
-    figure: marks this test function as using hash-based Matplotlib figure verification. This mark is not meant to be directly applied, but is instead automatically applied when a test function uses the @sunpy.tests.helpers.figure_test decorator.
-    benchmark: marks this test as a benchmark
 # Disable internet access for tests not marked remote_data
 remote_data_strict = True
 asdf_schema_root = dkist/io/asdf/resources/
 asdf_schema_tests_enabled = true
+markers =
+    online: marks this test function as needing online connectivity.
+    figure: marks this test function as using hash-based Matplotlib figure verification. This mark is not meant to be directly applied, but is instead automatically applied when a test function uses the @sunpy.tests.helpers.figure_test decorator.
+    benchmark: marks this test as a benchmark
+addopts =
+    --doctest-rst
+    -p no:unraisableexception
+    -p no:threadexception
 filterwarnings =
     # Turn all warnings into errors so they do not pass silently.
     error