Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update asdf schemas and add support for gwcs 1.1.0 #84

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions .circleci/config.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .circleci/early_exit.sh

This file was deleted.

15 changes: 8 additions & 7 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -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
14 changes: 7 additions & 7 deletions dkist/io/asdf/schemas/dkist.nso.edu/dkist/dataset-0.1.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
...
41 changes: 41 additions & 0 deletions dkist/io/asdf/schemas/dkist.nso.edu/dkist/dataset-0.2.0.yaml
Original file line number Diff line number Diff line change
@@ -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
...
2 changes: 1 addition & 1 deletion dkist/io/asdf/tags/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 3 additions & 1 deletion dkist/io/level_1_dataset_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# git deps for read the docs
git+https://github.com/sunpy/ndcube
22 changes: 0 additions & 22 deletions requirements.txt

This file was deleted.