dkist 1.9.2__tar.gz → 1.10.0__tar.gz

{dkist-1.9.2 → dkist-1.10.0}/.circleci/config.yml

@@ -32,7 +32,7 @@ jobs:
       jobname:
         type: string
     docker:
-      - image: cimg/python:3.12
+      - image: cimg/python:3.13
     environment:
       TOXENV=<< parameters.jobname >>
     steps:
@@ -54,7 +54,7 @@ jobs:
       jobname:
         type: string
     docker:
-      - image: cimg/python:3.12
+      - image: cimg/python:3.13
     environment:
       TOXENV: << parameters.jobname >>
       GIT_SSH_COMMAND: ssh -i ~/.ssh/id_rsa_7b8fc81c13a3b446ec9aa50d3f626978
@@ -96,16 +96,16 @@ workflows:
           matrix:
             parameters:
               jobname:
-                - "py312-figure"
-                - "py312-figure-devdeps"
+                - "py313-figure"
+                - "py313-figure-devdeps"
 
       - deploy-reference-images:
           name: baseline-<< matrix.jobname >>
           matrix:
             parameters:
               jobname:
-                - "py312-figure"
-                - "py312-figure-devdeps"
+                - "py313-figure"
+                - "py313-figure-devdeps"
           requires:
             - << matrix.jobname >>
           filters:

{dkist-1.9.2 → dkist-1.10.0}/.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sunpy/package-template",
-  "commit": "d6b86e07efa31959f43e99ba32d323cf76736a05",
+  "commit": "29db3569a215e43fa8c5114d3dbcb98b6a9caac0",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -32,7 +32,7 @@
         ".github/workflows/sub_package_update.yml"
       ],
       "_template": "https://github.com/sunpy/package-template",
-      "_commit": "d6b86e07efa31959f43e99ba32d323cf76736a05"
+      "_commit": "29db3569a215e43fa8c5114d3dbcb98b6a9caac0"
     }
   },
   "directory": null

{dkist-1.9.2 → dkist-1.10.0}/.github/workflows/main.yml

@@ -33,22 +33,22 @@ jobs:
   tests:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
     with:
-      default_python: '3.10'
+      default_python: '3.13'
       coverage: 'codecov'
       posargs: '--color=yes'
       envs: |
+        - linux: py313
         - linux: py312
-        - linux: py311
-        - windows: py311-online
-        - macos: py310
-        - linux: py310-oldestdeps
+        - windows: py312-online
+        - macos: py311
+        - linux: py311-oldestdeps
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   docs:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
     with:
-      default_python: '3.10'
+      default_python: '3.12'
       coverage: 'codecov'
       envs: |
         - linux: build_docs-notebooks
@@ -65,7 +65,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.13'
       - run: python -m pip install -U --user build
       - run: python -m build . --sdist
       - run: python -m pip install -U --user twine
@@ -77,7 +77,7 @@ jobs:
       coverage: 'codecov'
       posargs: '--color=yes'
       envs: |
-        - linux: py311-devdeps
+        - linux: py313-devdeps
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
@@ -90,7 +90,7 @@ jobs:
       )
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@main
     with:
-      python-version: '3.10'
+      python-version: '3.13'
       test_extras: tests
       test_command: pytest --pyargs dkist -k "not test_fail"
       # We have to work around a github runner bug here: https://github.com/actions/runner/issues/2788#issuecomment-2145922705

{dkist-1.9.2 → dkist-1.10.0}/.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
     # This should be before any formatting hooks like isort
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.8.6"
+    rev: "v0.9.4"
     hooks:
       - id: ruff
         args: ["--fix"]
   - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
+    rev: 6.0.0
     hooks:
       - id: isort
         exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|extern.*|dkist/extern)$"
@@ -26,7 +26,7 @@ repos:
       - id: mixed-line-ending
         exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|.asdf|.json|.hdr)$"
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         args: [ "--write-changes", "-D", "-", "-D", ".codespell-dict.txt"]

{dkist-1.9.2 → dkist-1.10.0}/.rtd-environment.yml

@@ -2,6 +2,6 @@ name: dkist
 channels:
   - conda-forge
 dependencies:
-  - python=3.12
+  - python=3.13
   - pip
   - graphviz!=2.42.*,!=2.43.*

{dkist-1.9.2 → dkist-1.10.0}/CHANGELOG.rst

@@ -1,5 +1,39 @@
-1.9.2 (2025-01-29)
-==================
+1.10.0 (2025-02-07)
+===================
+
+Backwards Incompatible Changes
+------------------------------
+
+- This release of ``dkist`` includes both scheduled bumps to our dependencies as well as a special bump of gwcs to version 0.24, and associated dependencies.
+  The version upgrade to gwcs 0.24 fixes the inverse transform (world to pixel) for VISP WCSs. (`#507 <https://github.com/DKISTDC/dkist/pull/507>`__)
+
+  * Python >= 3.11
+  * dask >= 2023.2
+  * gwcs >= 0.24
+  * matplotlib >= 3.7
+  * ndcube >= 2.1
+  * numpy >= 1.25
+  * parfive >= 2.1
+  * sunpy >= 5.0.7
+  * asdf >= 3.3
+  * asdf-astropy >= 0.5
+  * asdf-coordinate-schemas >= 0.3
+  * asdf-transform-schemas >= 0.5
+  * asdf-wcs-schemas >= 0.4 
+
+
+Features
+--------
+
+- Add a ``figure=`` keyword argument to `TiledDataset.plot` and make it default to the current figure. (`#491 <https://github.com/DKISTDC/dkist/pull/491>`__)
+- Add `swap_tile_limits` kwarg to `TiledDataset.plot`.
+  This option allows the user to invert plot limits on either axes to account for WCS values that decrease compared to the pixel axes. (`#504 <https://github.com/DKISTDC/dkist/pull/504>`__)
+- Update grid orientation of `TiledDataset.plot`.
+  The grid now has MAXIS1 columns and MAXIS2 rows where MINDEX1 corresponds to column and MINDEX2 corresponds to row.
+  Additionally, the origin for the grid is now in the lower-left as opposed to the upper-left. (`#504 <https://github.com/DKISTDC/dkist/pull/504>`__)
+- ``TiledDataset`` now has a ``.meta`` dictionary like that of ``Dataset``. (`#513 <https://github.com/DKISTDC/dkist/pull/513>`__)
+- History of the ADSF file, such as versions of packages and extensions used when writing it are now exposed ``TiledDataset.meta["history"]`` and ``Dataset.meta["history"]``. (`#513 <https://github.com/DKISTDC/dkist/pull/513>`__)
+
 
 Bug Fixes
 ---------
@@ -7,6 +41,14 @@ Bug Fixes
 - Improve the ASDF detection code so out of date ASDF filenames generated by the DKIST data center are skipped if a newer filename is present. (`#503 <https://github.com/DKISTDC/dkist/pull/503>`__)
 
 
+Improved Documentation
+----------------------
+
+- Update the :ref:`dkist:examples:vbi-reproject` example for improvements in ``TiledDataset``. (`#491 <https://github.com/DKISTDC/dkist/pull/491>`__)
+- Add an examples section for tutorial style self-contained examples. (`#491 <https://github.com/DKISTDC/dkist/pull/491>`__)
+- Add a how-to guide on redownloading the sample data with Fido / Globus. (`#491 <https://github.com/DKISTDC/dkist/pull/491>`__)
+
+
 1.9.1 (2025-01-15)
 ==================
 

{dkist-1.9.2/dkist.egg-info → dkist-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dkist
-Version: 1.9.2
+Version: 1.10.0
 Summary: DKIST User Tools
 Author-email: NSO / AURA <stuart@cadair.com>
 Project-URL: Homepage, https://github.com/DKISTDC/dkist
@@ -9,27 +9,27 @@ Project-URL: Download, https://pypi.org/project/dkist
 Project-URL: Documentation, https://docs.dkist.nso.edu/projects/python-tools/en/stable/
 Project-URL: Changelog, https://docs.dkist.nso.edu/projects/python-tools/en/stable/whatsnew/changelog.html
 Project-URL: Issue Tracker, https://github.com/DKISTDC/dkist/issues
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.rst
-Requires-Dist: aiohttp>=3.8
-Requires-Dist: asdf>=2.11.2
-Requires-Dist: asdf-astropy>=0.2.0
-Requires-Dist: asdf-coordinates-schemas>=0.1.0
-Requires-Dist: asdf-standard>=1.0.3
-Requires-Dist: asdf-transform-schemas>=0.3.0
-Requires-Dist: asdf-wcs-schemas>=0.3.0
-Requires-Dist: astropy>=5.3
-Requires-Dist: dask[array]>=2021.8.0
+Requires-Dist: aiohttp>=3.9
+Requires-Dist: asdf>=3.3.0
+Requires-Dist: asdf-astropy>=0.5.0
+Requires-Dist: asdf-coordinates-schemas>=0.3.0
+Requires-Dist: asdf-standard>=1.1.0
+Requires-Dist: asdf-transform-schemas>=0.5.0
+Requires-Dist: asdf-wcs-schemas>=0.4.0
+Requires-Dist: astropy>=6.0
+Requires-Dist: dask[array]>=2023.2.0
 Requires-Dist: globus-sdk>=3.0
-Requires-Dist: gwcs>=0.19.0
-Requires-Dist: matplotlib>=3.5
-Requires-Dist: ndcube[plotting,reproject]>=2.0
-Requires-Dist: numpy>=1.22
-Requires-Dist: parfive[ftp]>=1.5
+Requires-Dist: gwcs>=0.24.0
+Requires-Dist: matplotlib>=3.7
+Requires-Dist: ndcube[plotting,reproject]>=2.1
+Requires-Dist: numpy>=1.25
+Requires-Dist: parfive[ftp]>=2.1
 Requires-Dist: platformdirs>=3.0
-Requires-Dist: sunpy[asdf,net]>=4.0.7
-Requires-Dist: tqdm>=4.63
+Requires-Dist: sunpy[asdf,net]>=5.0.7
+Requires-Dist: tqdm>=4.65
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-doctestplus; extra == "tests"
@@ -54,7 +54,7 @@ Requires-Dist: sphinx-astropy; extra == "docs"
 Requires-Dist: sphinx-gallery; extra == "docs"
 Requires-Dist: pytest; extra == "docs"
 Requires-Dist: sphinx_autodoc_typehints; extra == "docs"
-Requires-Dist: dkist-sphinx-theme>=1.1.2; extra == "docs"
+Requires-Dist: dkist-sphinx-theme>=2.0; extra == "docs"
 Requires-Dist: sphinx-design; extra == "docs"
 Requires-Dist: myst-nb; extra == "docs"
 Requires-Dist: ipywidgets; extra == "docs"

{dkist-1.9.2 → dkist-1.10.0}/dkist/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.9.2'
-__version_tuple__ = version_tuple = (1, 9, 2)
+__version__ = version = '1.10.0'
+__version_tuple__ = version_tuple = (1, 10, 0)

{dkist-1.9.2 → dkist-1.10.0}/dkist/conftest.py

@@ -305,7 +305,8 @@ def simple_tiled_dataset(dataset):
     for ds in datasets:
         ds.meta["inventory"] = dataset.meta["inventory"]
     dataset_array = np.array(datasets).reshape((2,2))
-    return TiledDataset(dataset_array, dataset.meta["inventory"])
+    meta = {"inventory": dataset.meta["inventory"]}
+    return TiledDataset(dataset_array, meta=meta)
 
 
 @pytest.fixture
@@ -420,8 +421,9 @@ def croppable_visp_dataset(tmp_path_factory):
 
 
 @pytest.fixture(scope="session")
-def croppable_cryo_dataset():
+def croppable_cryo_dataset(tmp_path_factory):
+    cryodir = tmp_path_factory.mktemp("data")
     with gzip.open(Path(rootdir) / "croppable_cryo.asdf.gz", mode="rb") as gfo:
-        with open(rootdir / "croppable_cryo.asdf", mode="wb") as afo:
+        with open(cryodir / "croppable_cryo.asdf", mode="wb") as afo:
             afo.write(gfo.read())
-    return load_dataset(Path(rootdir) / "croppable_cryo.asdf")
+    return load_dataset(cryodir / "croppable_cryo.asdf")

{dkist-1.9.2 → dkist-1.10.0}/dkist/data/api_search_values.json

@@ -1 +1 @@
-{"parameterValues":[{"parameterName":"createDateMin","values":{"minValue":"2022-12-08T19:07:55.038280","maxValue":"2025-01-28T07:25:53.776348"}},{"parameterName":"createDateMax","values":{"minValue":"2022-12-08T19:07:55.038280","maxValue":"2025-01-28T07:25:53.776348"}},{"parameterName":"endTimeMin","values":{"minValue":"2022-02-23T20:48:55.393500","maxValue":"2024-11-08T22:02:14.064417"}},{"parameterName":"endTimeMax","values":{"minValue":"2022-02-23T20:48:55.393500","maxValue":"2024-11-08T22:02:14.064417"}},{"parameterName":"exposureTimeMin","values":{"minValue":0.037,"maxValue":1380.2332394366197}},{"parameterName":"exposureTimeMax","values":{"minValue":0.037,"maxValue":1380.2332394366197}},{"parameterName":"instrumentNames","values":{"categoricalValues":["VBI","CRYO-NIRSP","VISP"]}},{"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.14787299538416715,"maxValue":263.313656131021}},{"parameterName":"qualityAveragePolarimetricAccuracyMax","values":{"minValue":0.14787299538416715,"maxValue":263.313656131021}},{"parameterName":"startTimeMin","values":{"minValue":"2022-02-23T19:05:32.338002","maxValue":"2024-11-08T21:40:00.522500"}},{"parameterName":"startTimeMax","values":{"minValue":"2022-02-23T19:05:32.338002","maxValue":"2024-11-08T21:40:00.522500"}},{"parameterName":"targetTypes","values":{"categoricalValues":["coronalhole","activecorona","quietcorona","prominence","sunspot","spicules","quietsun","plages","unknown","filament"]}},{"parameterName":"averageDatasetSpectralSamplingMin","values":{"minValue":0.000540156130946172,"maxValue":0.004605031614270178}},{"parameterName":"averageDatasetSpectralSamplingMax","values":{"minValue":0.000540156130946172,"maxValue":0.004605031614270178}},{"parameterName":"averageDatasetSpatialSamplingMin","values":{"minValue":0.0,"maxValue":12388.04306084}},{"parameterName":"averageDatasetSpatialSamplingMax","values":{"minValue":0.0,"maxValue":12388.04306084}},{"parameterName":"averageDatasetTemporalSamplingMin","values":{"minValue":2.66666599999823,"maxValue":5263.145059399398}},{"parameterName":"averageDatasetTemporalSamplingMax","values":{"minValue":2.66666599999823,"maxValue":5263.145059399398}},{"parameterName":"highLevelSoftwareVersion","values":{"categoricalValues":["Alakai_10-0","Pono_6.1.5","Pono_2.1.0","Alakai_5-1","Pono_3.1.0","Pono_8.0.0","Alakai_11.1.0","Alakai_6-0","Alakai_8-0","Alakai_7-0","Pono_7.0.0","Pono_1.0.0","Alakai_3-0","Alakai_4-0","Pono_9.1.0"]}},{"parameterName":"workflowName","values":{"categoricalValues":["l0_to_l1_visp","l0_to_l1_cryonirsp_sp","l0_to_l1_cryonirsp_ci","l0_to_l1_vbi_summit-calibrated"]}},{"parameterName":"workflowVersion","values":{"categoricalValues":["1.18.6","2.16.7","1.18.0","2.0.2","1.11.1","2.20.9","2.19.5","1.2.1","2.7.5","2.19.4","2.3.1","2.19.3","1.15.0","1.0.0","1.15.1","1.3.5","1.18.4","2.16.0","1.2.0","2.10.2","2.7.4","1.18.8","2.10.3","2.20.8","2.16.4","1.1.7","2.17.0","0.16.0","1.3.2","1.17.5","1.1.10","2.15.0","2.20.7","2.7.2","2.10.15","1.4.9","1.1.2","2.7.0","2.19.1","2.20.5","2.20.10","2.10.1","2.7.3","1.12.1","2.10.12","1.1.5","1.3.3","2.6.1","2.10.13","2.19.2","2.0.1","1.18.5","1.4.8","1.8.2","2.9.0","2.10.7","2.3.0","2.10.0","1.17.1","1.13.0","2.20.6","1.14.7","1.4.11","2.20.3","2.13.1","1.4.1"]}},{"parameterName":"headerDataUnitCreationDateMin","values":{"minValue":"2022-12-08T17:30:30.462000","maxValue":"2025-01-28T00:07:38.944000"}},{"parameterName":"headerDataUnitCreationDateMax","values":{"minValue":"2022-12-08T17:30:30.462000","maxValue":"2025-01-28T00:07:38.944000"}},{"parameterName":"headerVersion","values":{"categoricalValues":["4.3.0","4.6.0","4.0.0","4.1.1","3.4.0","3.9.0","4.7.0","4.10.0","3.5.0","4.2.0","3.6.0","3.3.0","3.0.0","3.7.1","3.8.1","4.5.0"]}},{"parameterName":"spectralLines","values":{"categoricalValues":["Na I D2 (589.0 nm)","Sr I (460.73 nm)","Ca II (854.21 nm)","Fe I (630.15 nm)","Ca II K (393.37 nm)","Ca II H (396.85 nm)","Na I D1 (589.59 nm)","Mg I b1 (517.27 nm)","Fe I (630.25 nm)","Fe XIII (1079.8 nm)","Fe XIII (1074.7 nm)","H epsilon (397.0 nm)","Fe I (525.04 nm)","H beta (486.13 nm)","He I (1083.0 nm)","H alpha (656.28 nm)"]}}]}
+{"parameterValues":[{"parameterName":"createDateMin","values":{"minValue":"2022-12-08T19:07:55.038280","maxValue":"2025-02-01T03:44:31.791568"}},{"parameterName":"createDateMax","values":{"minValue":"2022-12-08T19:07:55.038280","maxValue":"2025-02-01T03:44:31.791568"}},{"parameterName":"endTimeMin","values":{"minValue":"2022-02-23T20:48:55.393500","maxValue":"2024-11-08T22:02:14.064417"}},{"parameterName":"endTimeMax","values":{"minValue":"2022-02-23T20:48:55.393500","maxValue":"2024-11-08T22:02:14.064417"}},{"parameterName":"exposureTimeMin","values":{"minValue":0.037,"maxValue":1380.2332394366197}},{"parameterName":"exposureTimeMax","values":{"minValue":0.037,"maxValue":1380.2332394366197}},{"parameterName":"instrumentNames","values":{"categoricalValues":["VBI","CRYO-NIRSP","VISP"]}},{"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.14787299538416715,"maxValue":263.313656131021}},{"parameterName":"qualityAveragePolarimetricAccuracyMax","values":{"minValue":0.14787299538416715,"maxValue":263.313656131021}},{"parameterName":"startTimeMin","values":{"minValue":"2022-02-23T19:05:32.338002","maxValue":"2024-11-08T21:40:00.522500"}},{"parameterName":"startTimeMax","values":{"minValue":"2022-02-23T19:05:32.338002","maxValue":"2024-11-08T21:40:00.522500"}},{"parameterName":"targetTypes","values":{"categoricalValues":["coronalhole","activecorona","quietcorona","prominence","sunspot","spicules","quietsun","plages","unknown","filament"]}},{"parameterName":"averageDatasetSpectralSamplingMin","values":{"minValue":0.000540156130946172,"maxValue":0.004605031614270178}},{"parameterName":"averageDatasetSpectralSamplingMax","values":{"minValue":0.000540156130946172,"maxValue":0.004605031614270178}},{"parameterName":"averageDatasetSpatialSamplingMin","values":{"minValue":0.0,"maxValue":12388.04306084}},{"parameterName":"averageDatasetSpatialSamplingMax","values":{"minValue":0.0,"maxValue":12388.04306084}},{"parameterName":"averageDatasetTemporalSamplingMin","values":{"minValue":2.66666599999823,"maxValue":5263.145059399398}},{"parameterName":"averageDatasetTemporalSamplingMax","values":{"minValue":2.66666599999823,"maxValue":5263.145059399398}},{"parameterName":"highLevelSoftwareVersion","values":{"categoricalValues":["Alakai_10-0","Pono_6.1.5","Pono_2.1.0","Alakai_5-1","Pono_3.1.0","Pono_8.0.0","Alakai_11.1.0","Alakai_6-0","Alakai_8-0","Alakai_7-0","Pono_7.0.0","Pono_1.0.0","Alakai_3-0","Alakai_4-0","Pono_9.1.0"]}},{"parameterName":"workflowName","values":{"categoricalValues":["l0_to_l1_visp","l0_to_l1_cryonirsp_sp","l0_to_l1_cryonirsp_ci","l0_to_l1_vbi_summit-calibrated"]}},{"parameterName":"workflowVersion","values":{"categoricalValues":["1.18.6","2.16.7","1.18.0","2.0.2","1.11.1","2.20.9","2.19.5","1.2.1","2.7.5","2.19.4","2.3.1","2.19.3","1.15.0","1.0.0","1.15.1","1.3.5","1.18.4","2.16.0","1.2.0","2.10.2","2.7.4","1.18.8","2.10.3","2.20.8","2.16.4","1.4.15","1.1.7","2.17.0","0.16.0","1.3.2","1.17.5","1.1.10","2.15.0","2.20.7","2.7.2","2.10.15","1.4.9","1.1.2","2.7.0","2.19.1","2.20.5","2.20.10","2.10.1","2.7.3","1.12.1","2.10.12","1.1.5","1.3.3","2.6.1","2.10.13","2.19.2","2.0.1","1.18.5","1.4.8","1.8.2","2.9.0","2.10.7","2.3.0","2.10.0","1.17.1","1.13.0","2.20.6","1.14.7","1.4.11","2.20.3","2.13.1","1.4.1"]}},{"parameterName":"headerDataUnitCreationDateMin","values":{"minValue":"2022-12-08T17:30:30.462000","maxValue":"2025-02-01T03:21:22.091000"}},{"parameterName":"headerDataUnitCreationDateMax","values":{"minValue":"2022-12-08T17:30:30.462000","maxValue":"2025-02-01T03:21:22.091000"}},{"parameterName":"headerVersion","values":{"categoricalValues":["4.3.0","4.6.0","4.0.0","4.1.1","3.4.0","3.9.0","4.7.0","4.10.0","3.5.0","4.2.0","3.6.0","3.3.0","3.0.0","3.7.1","3.8.1","4.5.0"]}},{"parameterName":"spectralLines","values":{"categoricalValues":["Na I D2 (589.0 nm)","Sr I (460.73 nm)","Ca II (854.21 nm)","Fe I (630.15 nm)","Ca II K (393.37 nm)","Ca II H (396.85 nm)","Na I D1 (589.59 nm)","Mg I b1 (517.27 nm)","Fe I (630.25 nm)","Fe XIII (1079.8 nm)","Fe XIII (1074.7 nm)","H epsilon (397.0 nm)","Fe I (525.04 nm)","H beta (486.13 nm)","He I (1083.0 nm)","H alpha (656.28 nm)"]}}]}

{dkist-1.9.2 → dkist-1.10.0}/dkist/dataset/loader.py

@@ -22,12 +22,6 @@ except ImportError:
 ASDF_FILENAME_PATTERN = r"^(?P<instrument>[A-Z-]+)_L1_(?P<timestamp>\d{8}T\d{6})_(?P<datasetid>[A-Z]{5,})(?P<suffix>_user_tools|_metadata)?.asdf$"
 
 
-def asdf_open_memory_mapping_kwarg(memmap: bool) -> dict:
-    if asdf.__version__ > "3.1.0":
-        return {"memmap": memmap}
-    return {"copy_arrays": not memmap}
-
-
 @singledispatch
 def load_dataset(target):
     """
@@ -108,9 +102,7 @@ def _load_from_results(results):
     return _load_from_iterable(results)
 
 
-# In Python 3.11 we can use the Union type here
-@load_dataset.register(list)
-@load_dataset.register(tuple)
+@load_dataset.register(tuple | list)
 def _load_from_iterable(iterable):
     """
     A list or tuple of valid inputs to ``load_dataset``.
@@ -243,8 +235,9 @@ def _load_from_asdf(filepath):
     try:
         with importlib_resources.as_file(importlib_resources.files("dkist.io") / "level_1_dataset_schema.yaml") as schema_path:
             with asdf.open(filepath, custom_schema=schema_path.as_posix(),
-                           lazy_load=False, **asdf_open_memory_mapping_kwarg(memmap=False)) as ff:
+                           lazy_load=False, memmap=False) as ff:
                 ds = ff.tree["dataset"]
+                ds.meta["history"] = ff.tree["history"]
                 if isinstance(ds, TiledDataset):
                     for sub in ds.flat:
                         sub.files.basepath = base_path

{dkist-1.9.2 → dkist-1.10.0}/dkist/dataset/tests/test_crop_dataset.py

@@ -1,3 +1,4 @@
+import numpy as np
 import pytest
 
 import astropy.units as u
@@ -7,6 +8,13 @@ from astropy.time import Time
 gwcs = pytest.importorskip("gwcs", "0.22.2a1.dev2")
 
 
+def assert_skycoord_allclose(coord1, coord2):
+    assert coord1.is_equivalent_frame(coord2)
+    data1 = coord1.frame.cartesian.xyz
+    data2 = coord2.frame.cartesian.xyz
+    assert np.allclose(data1, data2)
+
+
 def test_crop_visp_by_only_stokes(croppable_visp_dataset):
 
     cropped = croppable_visp_dataset.crop([
@@ -52,11 +60,11 @@ def test_crop_visp_by_time(croppable_visp_dataset):
 
     orig_coords = croppable_visp_dataset.axis_world_coords()
     cropped_coords = cropped.axis_world_coords()
-    assert (cropped_coords[0][0] == orig_coords[0][200]).all()
-    assert (cropped_coords[0][-1] == orig_coords[0][400]).all()
-    assert (cropped_coords[1] == orig_coords[1]).all()
-    assert (cropped_coords[2] == orig_coords[2][200:401]).all()
-    assert (cropped_coords[3] == orig_coords[3]).all()
+    assert_skycoord_allclose(cropped_coords[0][0], orig_coords[0][200])
+    assert_skycoord_allclose(cropped_coords[0][-1], orig_coords[0][400])
+    assert np.allclose(cropped_coords[1], orig_coords[1])
+    assert np.allclose(cropped_coords[2].jd, orig_coords[2][200:401].jd)
+    assert np.allclose(cropped_coords[3], orig_coords[3])
 
 
 def test_crop_visp_by_lonlat(croppable_visp_dataset):
@@ -90,11 +98,11 @@ def test_crop_visp_by_lonlat(croppable_visp_dataset):
 
     orig_coords = croppable_visp_dataset.axis_world_coords()
     cropped_coords = cropped.axis_world_coords()
-    assert (cropped_coords[0][0] == orig_coords[0][200][500:1001]).all()
-    assert (cropped_coords[0][-1] == orig_coords[0][600][500:1001]).all()
-    assert (cropped_coords[1] == orig_coords[1]).all()
-    assert (cropped_coords[2] == orig_coords[2][200:601]).all()
-    assert (cropped_coords[3] == orig_coords[3]).all()
+    assert_skycoord_allclose(cropped_coords[0][0], orig_coords[0][200][500:1001])
+    assert_skycoord_allclose(cropped_coords[0][-1], orig_coords[0][600][500:1001])
+    assert np.allclose(cropped_coords[1], orig_coords[1])
+    assert np.allclose(cropped_coords[2].jd, orig_coords[2][200:601].jd)
+    assert np.allclose(cropped_coords[3], orig_coords[3])
 
 
 def test_crop_cryo_by_only_stokes(croppable_cryo_dataset):
@@ -144,12 +152,12 @@ def test_crop_cryo_by_time(croppable_cryo_dataset):
     cropped_coords = cropped.axis_world_coords()
 
     # Whole coordinate array is too large to compare, so check just the edges
-    assert (cropped_coords[0][0, 0, 0, :] == orig_coords[0][0, 0, 0, :]).all()
-    assert (cropped_coords[0][0, 0, -1, :] == orig_coords[0][0, 0, -1, :]).all()
-    assert (cropped_coords[0][0, 0, :, 0] == orig_coords[0][0, 0, :, 0]).all()
-    assert (cropped_coords[0][0, 0, :, -1] == orig_coords[0][0, 0, :, -1]).all()
-    assert (cropped_coords[1] == orig_coords[1][:2, :2]).all()
-    assert (cropped_coords[2] == orig_coords[2]).all()
+    assert_skycoord_allclose(cropped_coords[0][0, 0, 0, :], orig_coords[0][0, 0, 0, :])
+    assert_skycoord_allclose(cropped_coords[0][0, 0, -1, :], orig_coords[0][0, 0, -1, :])
+    assert_skycoord_allclose(cropped_coords[0][0, 0, :, 0], orig_coords[0][0, 0, :, 0])
+    assert_skycoord_allclose(cropped_coords[0][0, 0, :, -1], orig_coords[0][0, 0, :, -1])
+    assert np.allclose(cropped_coords[1].jd, orig_coords[1][:2, :2].jd)
+    assert np.allclose(cropped_coords[2], orig_coords[2])
 
 
 def test_crop_cryo_by_only_lonlat(croppable_cryo_dataset):
@@ -180,6 +188,6 @@ def test_crop_cryo_by_only_lonlat(croppable_cryo_dataset):
     orig_coords = croppable_cryo_dataset.axis_world_coords()
     cropped_coords = cropped.axis_world_coords()
 
-    assert (cropped_coords[0][0, 0] == orig_coords[0][0, 0, :201, :201]).all()
-    assert (cropped_coords[1] == orig_coords[1]).all()
-    assert (cropped_coords[2] == orig_coords[2]).all()
+    assert_skycoord_allclose(cropped_coords[0][0, 0], orig_coords[0][0, 0, :201, :201])
+    assert np.allclose(cropped_coords[1].jd, orig_coords[1].jd)
+    assert np.allclose(cropped_coords[2], orig_coords[2])

{dkist-1.9.2 → dkist-1.10.0}/dkist/dataset/tests/test_tiled_dataset.py

@@ -1,3 +1,4 @@
+import re
 import copy
 
 import matplotlib.pyplot as plt
@@ -6,6 +7,7 @@ import pytest
 
 from dkist import Dataset, TiledDataset, load_dataset
 from dkist.tests.helpers import figure_test
+from dkist.utils.exceptions import DKISTUserWarning
 
 
 def test_tiled_dataset(simple_tiled_dataset, dataset):
@@ -44,16 +46,17 @@ def test_tiled_dataset_headers(simple_tiled_dataset, dataset):
 
 
 def test_tiled_dataset_invalid_construction(dataset, dataset_4d):
+    meta = {"inventory": dataset.meta["inventory"]}
     with pytest.raises(ValueError, match="inventory record of the first dataset"):
         TiledDataset(np.array((dataset, dataset_4d)))
 
     with pytest.raises(ValueError, match="physical types do not match"):
-        TiledDataset(np.array((dataset, dataset_4d)), inventory=dataset.meta["inventory"])
+        TiledDataset(np.array((dataset, dataset_4d)), meta=meta)
 
     ds2 = copy.deepcopy(dataset)
     ds2.meta["inventory"] = {"hello": "world"}
     with pytest.raises(ValueError, match="inventory records of all the datasets"):
-        TiledDataset(np.array((dataset, ds2)), dataset.meta["inventory"])
+        TiledDataset(np.array((dataset, ds2)), meta=meta)
 
 
 def test_tiled_dataset_from_components(dataset):
@@ -78,6 +81,7 @@ def test_tiled_dataset_from_components(dataset):
 def test_tileddataset_plot(share_zscale):
     from dkist.data.sample import VBI_AJQWW
     ori_ds = load_dataset(VBI_AJQWW)
+
     newtiles = []
     for tile in ori_ds.flat:
         newtiles.append(tile.rebin((1, 8, 8), operation=np.sum))
@@ -85,11 +89,86 @@ def test_tileddataset_plot(share_zscale):
     # https://github.com/sunpy/ndcube/issues/815
     for tile in newtiles:
         tile.meta["inventory"] = ori_ds.inventory
-    ds = TiledDataset(np.array(newtiles).reshape(ori_ds.shape), inventory=newtiles[0].inventory)
+    ds = TiledDataset(np.array(newtiles).reshape(ori_ds.shape), meta={"inventory": newtiles[0].inventory})
+
     fig = plt.figure(figsize=(12, 15))
-    ds.plot(0, share_zscale=share_zscale)
+    with pytest.warns(DKISTUserWarning,
+                      match="The metadata ASDF file that produced this dataset is out of date and will result in "
+                            "incorrect plots. Please re-download the metadata ASDF file."):
+        #TODO: Once sample data have been updated maybe we should test both paths here (old data and new data)
+        ds.plot(0, share_zscale=share_zscale, figure=fig)
+
     return plt.gcf()
 
+@figure_test
+@pytest.mark.parametrize("swap_tile_limits", ["x", "y", "xy", None])
+def test_tileddataset_plot_limit_swapping(swap_tile_limits):
+    # Also test that row/column sizes are correct
+
+    from dkist.data.sample import VBI_AJQWW
+    ori_ds = load_dataset(VBI_AJQWW)
+
+    # Swap WCS to make the `swap_tile_limits` option more natural
+    for tile in ori_ds.flat:
+        tile.wcs.forward_transform[0].cdelt *= -1
+
+    newtiles = []
+    for tile in ori_ds.flat:
+        newtiles.append(tile.rebin((1, 8, 8), operation=np.sum))
+    # ndcube 2.3.0 introduced a deepcopy for rebin, this broke our dataset validation
+    # https://github.com/sunpy/ndcube/issues/815
+    for tile in newtiles:
+        tile.meta["inventory"] = ori_ds.inventory
+    ds = TiledDataset(np.array(newtiles).reshape(ori_ds.shape), meta={"inventory": newtiles[0].inventory})
+
+    non_square_ds = ds[:2, :]
+    assert non_square_ds.shape[0] != non_square_ds.shape[1]  # Just in case the underlying data change for some reason
+
+    fig = plt.figure(figsize=(12, 15))
+    with pytest.warns(DKISTUserWarning,
+                      match="The metadata ASDF file that produced this dataset is out of date and will result in "
+                            "incorrect plots. Please re-download the metadata ASDF file."):
+        #TODO: Once sample data have been updated maybe we should test both paths here (old data and new data)
+        non_square_ds.plot(0, share_zscale=False, swap_tile_limits=swap_tile_limits, figure=fig)
+
+    assert fig.axes[0].get_gridspec().get_geometry() == non_square_ds.shape[::-1]
+    for ax in fig.axes:
+        xlims = ax.get_xlim()
+        ylims = ax.get_ylim()
+
+        if swap_tile_limits in ["x", "xy"]:
+            assert xlims[0] > xlims[1]
+        if swap_tile_limits in ["y", "xy"]:
+            assert ylims[0] > ylims[1]
+        if swap_tile_limits is None:
+            assert xlims[0] < xlims[1]
+            assert ylims[0] < ylims[1]
+
+    return plt.gcf()
+
+@pytest.mark.remote_data
+def test_tileddataset_plot_non2d_sliceindex():
+    from dkist.data.sample import VBI_AJQWW
+    ds = load_dataset(VBI_AJQWW)
+
+    newtiles = []
+    for tile in ds.flat:
+        newtiles.append(tile.rebin((1, 8, 8), operation=np.sum))
+    # ndcube 2.3.0 introduced a deepcopy for rebin, this broke our dataset validation
+    # https://github.com/sunpy/ndcube/issues/815
+    for tile in newtiles:
+        tile.meta["inventory"] = ds.inventory
+    ds = TiledDataset(np.array(newtiles).reshape(ds.shape), meta={"inventory": newtiles[0].inventory})
+
+    already_sliced_ds = ds.slice_tiles[0]
+
+    fig = plt.figure(figsize=(12, 15))
+    with pytest.warns(DKISTUserWarning,
+                      match="The metadata ASDF file that produced this dataset is out of date and will result in "
+                            "incorrect plots. Please re-download the metadata ASDF file."):
+        with pytest.raises(ValueError, match=re.escape("Applying slice '(0,)' to this dataset resulted in a 1 "
+                "dimensional dataset, you should pass a slice which results in a 2D dataset for each tile.")):
+            already_sliced_ds.plot(0, figure=fig)
 
 @pytest.mark.accept_cli_tiled_dataset
 def test_repr(simple_tiled_dataset):