Updates for gwcs 0.14 and ndcube 2 beta

.readthedocs.yml

@@ -1,9 +1,10 @@
-build:
-  image: latest
-
-requirements_file: requirements.txt
+version: 2
 
 python:
-  version: 3.6
-  pip_install: false
-  setup_py_install: true
+  version: 3.8
+  install:
+    - requirements: docs/requirements.txt
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

changelog/86.trivial.rst

@@ -0,0 +1 @@
+Support gwcs 0.14 and ndcube 2.0.0b1

dkist/dataset/dataset.py

@@ -7,8 +7,7 @@
 import asdf
 import astropy.table
 import gwcs
-from astropy.visualization.wcsaxes import WCSAxes
-from astropy.wcs.wcsapi import SlicedLowLevelWCS
+from astropy.wcs.wcsapi.wrappers import SlicedLowLevelWCS
 from ndcube.ndcube import NDCube
 
 from dkist.io import DaskFITSArrayContainer
@@ -93,28 +92,6 @@ def __init__(self, data, wcs, uncertainty=None, mask=None, meta=None,
         self._header_table = headers
         self._array_container = None
 
-    """
-    Changes to the NDCube APIs.
-    """
-
-    # Overload this to only expose the new API in this package, this can be
-    # removed once NDCube 2 is finalised.
-    def crop_by_coords(self, lower_corner, upper_corner, units=None):
-        return super().crop_by_coords(lower_corner, upper_corner=upper_corner, units=units)
-
-    @property
-    def world_axis_physical_types(self):
-        """
-        Returns an iterable of strings describing the physical type for each world axis.
-
-        The strings conform to the International Virtual Observatory Alliance
-        standard, UCD1+ controlled Vocabulary.  For a description of the standard and
-        definitions of the different strings and string components,
-        see http://www.ivoa.net/documents/latest/UCDlist.html.
-
-        """
-        return self.wcs.world_axis_physical_types[::-1]
-
     """
     Properties.
     """
@@ -201,12 +178,6 @@ def __repr__(self):
     def __str__(self):
         return dataset_info_str(self)
 
-    def _as_mpl_axes(self):
-        """
-        Allow this object to be passed to matplotlib as a projection.
-        """
-        return WCSAxes, {'transform': self.wcs}
-
     """
     DKIST specific methods.
     """

dkist/dataset/tests/test_dataset.py

@@ -2,7 +2,6 @@
 from pathlib import Path
 
 import dask.array as da
-import numpy as np
 import pytest
 
 import asdf
@@ -38,15 +37,15 @@ def test_repr(dataset, dataset_3d):
 
 def test_wcs_roundtrip(dataset):
     p = (10*u.pixel, 10*u.pixel)
-    w = dataset.pixel_to_world(*p)
-    p2 = dataset.world_to_pixel(w)
-    assert_quantity_allclose(p, p2)
+    w = dataset.wcs.pixel_to_world(*p)
+    p2 = dataset.wcs.world_to_pixel(w)
+    assert_quantity_allclose(p, p2 * u.pix)
 
 
 def test_wcs_roundtrip_3d(dataset_3d):
     p = (10*u.pixel, 10*u.pixel, 10*u.pixel)
-    w = dataset_3d.pixel_to_world(*p)
-    p2 = dataset_3d.world_to_pixel(*w)
+    w = dataset_3d.wcs.pixel_to_world(*p)
+    p2 = dataset_3d.wcs.world_to_pixel(*w) * u.pix
     assert_quantity_allclose(p[:2], p2[:2])
     assert_quantity_allclose(p[2], p2[2])
 
@@ -100,35 +99,6 @@ def test_no_filenames(dataset_3d):
     assert dataset_3d.filenames == []
 
 
-def test_crop_by_coords(dataset_3d):
-    arr = dataset_3d.crop_by_coords((5*u.nm, 5*u.arcsec, 5*u.arcsec),
-                                    (9*u.nm, 9*u.arcsec, 9*u.arcsec))
-
-    da_crop = dataset_3d.data[5:10, 5:10, 5:10]
-    assert arr.data.shape == da_crop.shape
-    assert np.allclose(arr.data, da_crop)
-
-
-def test_crop_by_coords_units(dataset_3d):
-    arr = dataset_3d.crop_by_coords((5, 5, 5),
-                                    (9, 9, 9),
-                                    (u.nm, u.arcsec, u.arcsec))
-
-    da_crop = dataset_3d.data[5:10, 5:10, 5:10]
-    assert arr.data.shape == da_crop.shape
-    assert np.allclose(arr.data, da_crop)
-
-
-def test_crop_by_coords_bad_args(dataset_3d):
-    with pytest.raises(ValueError):
-        dataset_3d.crop_by_coords((5, 5)*u.arcsec, (5, 5))
-
-
-def test_crop_by_coords_bad_units(dataset_3d):
-    with pytest.raises(ValueError):
-        dataset_3d.crop_by_coords((5, 5, 5), (9, 9, 9), units=(u.pix, u.pix))
-
-
 def test_download(mocker, dataset):
     mocker.patch("dkist.dataset.dataset.watch_transfer_progress",
                  autospec=True)

dkist/io/asdf/schemas/dkist.nso.edu/dkist/dataset-0.1.0.yaml

@@ -12,28 +12,28 @@ description:
 type: object
 properties:
   data:
-    $ref: "tag:dkist.nso.edu:dkist/array_container-0.2.0"
+    $ref: "http://dkist.nso.edu/schemas/dkist/array_container-0.2.0"
 
   wcs:
     description: The coordinate system for the complete dataset.
-    $ref: "tag:stsci.edu:gwcs/wcs-1.0.0"
+    $ref: "http://stsci.edu/schemas/gwcs/wcs-1.0.0"
 
   headers:
     description: A table of all the headers for the constituent files.
     anyOf:
-      - $ref: "tag:stsci.edu:asdf/core/table-1.0.0"
-      - $ref: "tag:astropy.org:astropy/table/table-1.0.0"
+      - $ref: "http://stsci.edu/schemas/asdf/core/table-1.0.0"
+      - $ref: "http://astropy.org/schemas/astropy/table/table-1.0.0"
 
   meta:
     description: Dataset metadata, describing the whole dataset.
     type: object
 
   mask:
-    $ref: "tag:stsci.edu:asdf/core/ndarray-1.0.0"
+    $ref: "http://stsci.edu/schemas/asdf/core/ndarray-1.0.0"
 
   unit:
-    $ref: "tag:stsci.edu:asdf/unit/unit-1.0.0"
+    $ref: "http://stsci.edu/schemas/asdf/unit/unit-1.0.0"
 
 required: [data, headers, wcs]
-allowAdditionalProperties: true
+additionalProperties: true
 ...

dkist/io/asdf/schemas/dkist.nso.edu/dkist/dataset-0.2.0.yaml

@@ -0,0 +1,41 @@
+%YAML 1.1
+---
+$schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
+id: "http://dkist.nso.edu/schemas/dkist/dataset-0.2.0"
+tag: "tag:dkist.nso.edu:dkist/dataset-0.2.0"
+
+title: |
+  A DKIST Level 1 Dataset object.
+description:
+  The container for a distributed dataset object.
+
+type: object
+properties:
+  data:
+    $ref: "http://dkist.nso.edu/schemas/dkist/array_container-0.2.0"
+
+  wcs:
+    description: The coordinate system for the complete dataset.
+    anyOf:
+      - $ref: "http://stsci.edu/schemas/gwcs/wcs-1.0.0"
+      - $ref: "http://stsci.edu/schemas/gwcs/wcs-1.1.0"
+
+  headers:
+    description: A table of all the headers for the constituent files.
+    anyOf:
+      - $ref: "http://stsci.edu/schemas/asdf/core/table-1.0.0"
+      - $ref: "http://astropy.org/schemas/astropy/table/table-1.0.0"
+
+  meta:
+    description: Dataset metadata, describing the whole dataset.
+    type: object
+
+  mask:
+    $ref: "http://stsci.edu/schemas/asdf/core/ndarray-1.0.0"
+
+  unit:
+    $ref: "http://stsci.edu/schemas/asdf/unit/unit-1.0.0"
+
+required: [data, headers, wcs]
+additionalProperties: true
+...

dkist/io/asdf/tags/dataset.py

@@ -14,7 +14,7 @@ class DatasetType(DKISTType):
     name = "dataset"
     types = ['dkist.dataset.Dataset']
     requires = ['dkist']
-    version = "0.1.0"
+    versions = ["0.1.0", "0.2.0"]
 
     @classmethod
     def from_tree(cls, node, ctx):

dkist/io/level_1_dataset_schema.yaml

@@ -11,7 +11,9 @@ tag: "tag:stsci.edu:asdf/core/asdf-1.1.0"
 type: object
 properties:
   dataset:
-    $ref: "tag:dkist.nso.edu:dkist/dataset-0.1.0"
+    anyOf:
+      - $ref: "http://dkist.nso.edu/schemas/dkist/dataset-0.1.0"
+      - $ref: "http://dkist.nso.edu/schemas/dkist/dataset-0.2.0"
 
 required: [dataset]
 additionalProperties: true

dkist/net/tests/test_client.py

@@ -107,8 +107,6 @@ def test_append_query_response(empty_query_response, example_api_response):
     assert isinstance(qr.blocks, list)
     assert qr.blocks == list(qr.table.iterrows())
 
-    assert DKISTQueryReponse.from_results(example_api_response["searchResults"]) == qr
-
 
 def test_length_0_qr(empty_query_response):
     assert len(empty_query_response) == 0

docs/requirements.txt

@@ -0,0 +1,2 @@
+# git deps for read the docs
+git+https://github.com/sunpy/ndcube

setup.cfg

@@ -26,11 +26,11 @@ install_requires =
   globus-sdk
   appdirs
   parfive[ftp]
-  astropy>=4.0
+  astropy
   asdf
-  gwcs>=0.12
-  sunpy[net,asdf]>=2.0rc2
-  ndcube>=2.0dev186
+  gwcs
+  sunpy[net,asdf]>=2.0
+  ndcube>=2.0.0b2
 setup_requires = setuptools_scm
 
 [options.extras_require]