Skip to content

Commit

Permalink
Merge pull request #116 from mdboom/version-1.0.0
Browse files Browse the repository at this point in the history
Move to version 1.0.0
  • Loading branch information
mdboom committed Sep 18, 2015
2 parents 0aec3be + 691fe55 commit 4ceda98
Show file tree
Hide file tree
Showing 118 changed files with 892 additions and 963 deletions.
2 changes: 1 addition & 1 deletion convert_schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ def convert_schema_to_rst(src, dst):
yaml_content = fd.read()

if schema.get('$schema') not in (
"http://stsci.edu/schemas/asdf/asdf-schema-0.1.0",
"http://stsci.edu/schemas/asdf/asdf-schema-1.0.0",
"http://stsci.edu/schemas/yaml-schema/draft-01",
"http://json-schema.org/draft-04/schema"):
return
Expand Down
12 changes: 0 additions & 12 deletions reference_files/0.1.0/ascii.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions reference_files/0.1.0/basic.yaml

This file was deleted.

192 changes: 0 additions & 192 deletions reference_files/0.1.0/complex.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions reference_files/0.1.0/exploded.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions reference_files/0.1.0/unicode_bmp.yaml

This file was deleted.

Binary file not shown.
12 changes: 12 additions & 0 deletions reference_files/1.0.0/ascii.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#ASDF 1.0.0
#ASDF_STANDARD 1.0.0
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-1.0.0
asdf_library: !core/software-1.0.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 1.0.0}
data: !core/ndarray-1.0.0
data: ['', ascii]
datatype: [ascii, 5]
shape: [2]
...
Binary file not shown.
12 changes: 12 additions & 0 deletions reference_files/1.0.0/basic.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#ASDF 1.0.0
#ASDF_STANDARD 1.0.0
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-1.0.0
asdf_library: !core/software-1.0.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 1.0.0}
data: !core/ndarray-1.0.0
data: [0, 1, 2, 3, 4, 5, 6, 7]
datatype: int64
shape: [8]
...
Binary file not shown.
192 changes: 192 additions & 0 deletions reference_files/1.0.0/complex.yaml

Large diffs are not rendered by default.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#ASDF 0.1.0
#ASDF_STANDARD 0.1.0
#ASDF 1.0.0
#ASDF_STANDARD 1.0.0
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-0.1.0
asdf_library: !core/software-0.1.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 0.0.dev644}
bzp2: !core/ndarray-0.1.0
--- !core/asdf-1.0.0
asdf_library: !core/software-1.0.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 1.0.0}
bzp2: !core/ndarray-1.0.0
data: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
Expand All @@ -15,7 +15,7 @@ bzp2: !core/ndarray-0.1.0
117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127]
datatype: int64
shape: [128]
zlib: !core/ndarray-0.1.0
zlib: !core/ndarray-1.0.0
data: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#ASDF 0.1.0
#ASDF_STANDARD 0.1.0
#ASDF 1.0.0
#ASDF_STANDARD 1.0.0
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-0.1.0
asdf_library: !core/software-0.1.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 0.0.dev644}
data: !core/ndarray-0.1.0
--- !core/asdf-1.0.0
asdf_library: !core/software-1.0.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 1.0.0}
data: !core/ndarray-1.0.0
source: exploded0000.asdf
datatype: int64
byteorder: little
Expand Down
12 changes: 12 additions & 0 deletions reference_files/1.0.0/exploded.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#ASDF 1.0.0
#ASDF_STANDARD 1.0.0
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-1.0.0
asdf_library: !core/software-1.0.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 1.0.0}
data: !core/ndarray-1.0.0
data: [0, 1, 2, 3, 4, 5, 6, 7]
datatype: int64
shape: [8]
...
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
#ASDF 0.1.0
#ASDF_STANDARD 0.1.0
#ASDF 1.0.0
#ASDF_STANDARD 1.0.0
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-0.1.0
asdf_library: !core/software-0.1.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 0.0.dev644}
datatype<f4: !core/ndarray-0.1.0
--- !core/asdf-1.0.0
asdf_library: !core/software-1.0.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 1.0.0}
datatype<f4: !core/ndarray-1.0.0
data: [0.0, -0.0, .nan, .inf, -.inf, -3.4028234663852886e+38, 3.4028234663852886e+38,
1.1920928955078125e-07, 5.960464477539063e-08, 1.1754943508222875e-38]
datatype: float32
shape: [10]
datatype<f8: !core/ndarray-0.1.0
datatype<f8: !core/ndarray-1.0.0
data: [0.0, -0.0, .nan, .inf, -.inf, -1.7976931348623157e+308, 1.7976931348623157e+308,
2.220446049250313e-16, 1.1102230246251565e-16, 2.2250738585072014e-308]
datatype: float64
shape: [10]
datatype>f4: !core/ndarray-0.1.0
datatype>f4: !core/ndarray-1.0.0
data: [0.0, -0.0, .nan, .inf, -.inf, -3.4028234663852886e+38, 3.4028234663852886e+38,
1.1920928955078125e-07, 5.960464477539063e-08, 1.1754943508222875e-38]
datatype: float32
shape: [10]
datatype>f8: !core/ndarray-0.1.0
datatype>f8: !core/ndarray-1.0.0
data: [0.0, -0.0, .nan, .inf, -.inf, -1.7976931348623157e+308, 1.7976931348623157e+308,
2.220446049250313e-16, 1.1102230246251565e-16, 2.2250738585072014e-308]
datatype: float64
Expand Down
Binary file not shown.
34 changes: 17 additions & 17 deletions reference_files/0.1.0/int.yaml → reference_files/1.0.0/int.yaml
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
#ASDF 0.1.0
#ASDF_STANDARD 0.1.0
#ASDF 1.0.0
#ASDF_STANDARD 1.0.0
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-0.1.0
asdf_library: !core/software-0.1.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 0.0.dev644}
datatype<i1: !core/ndarray-0.1.0
--- !core/asdf-1.0.0
asdf_library: !core/software-1.0.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 1.0.0}
datatype<i1: !core/ndarray-1.0.0
data: [127, -128, 0]
datatype: int8
shape: [3]
datatype<i2: !core/ndarray-0.1.0
datatype<i2: !core/ndarray-1.0.0
data: [32767, -32768, 0]
datatype: int16
shape: [3]
datatype<i4: !core/ndarray-0.1.0
datatype<i4: !core/ndarray-1.0.0
data: [2147483647, -2147483648, 0]
datatype: int32
shape: [3]
datatype<u1: !core/ndarray-0.1.0
datatype<u1: !core/ndarray-1.0.0
data: [255, 0]
datatype: uint8
shape: [2]
datatype<u2: !core/ndarray-0.1.0
datatype<u2: !core/ndarray-1.0.0
data: [65535, 0]
datatype: uint16
shape: [2]
datatype<u4: !core/ndarray-0.1.0
datatype<u4: !core/ndarray-1.0.0
data: [4294967295, 0]
datatype: uint32
shape: [2]
datatype>i1: !core/ndarray-0.1.0
datatype>i1: !core/ndarray-1.0.0
data: [127, -128, 0]
datatype: int8
shape: [3]
datatype>i2: !core/ndarray-0.1.0
datatype>i2: !core/ndarray-1.0.0
data: [32767, -32768, 0]
datatype: int16
shape: [3]
datatype>i4: !core/ndarray-0.1.0
datatype>i4: !core/ndarray-1.0.0
data: [2147483647, -2147483648, 0]
datatype: int32
shape: [3]
datatype>u1: !core/ndarray-0.1.0
datatype>u1: !core/ndarray-1.0.0
data: [255, 0]
datatype: uint8
shape: [2]
datatype>u2: !core/ndarray-0.1.0
datatype>u2: !core/ndarray-1.0.0
data: [65535, 0]
datatype: uint16
shape: [2]
datatype>u4: !core/ndarray-0.1.0
datatype>u4: !core/ndarray-1.0.0
data: [4294967295, 0]
datatype: uint32
shape: [2]
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#ASDF 0.1.0
#ASDF_STANDARD 0.1.0
#ASDF 1.0.0
#ASDF_STANDARD 1.0.0
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-0.1.0
asdf_library: !core/software-0.1.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 0.0.dev644}
data: !core/ndarray-0.1.0
--- !core/asdf-1.0.0
asdf_library: !core/software-1.0.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 1.0.0}
data: !core/ndarray-1.0.0
data: [0, 1, 2, 3, 4, 5, 6, 7]
datatype: int64
shape: [8]
subset: !core/ndarray-0.1.0
subset: !core/ndarray-1.0.0
data: [1, 3, 5, 7]
datatype: int64
shape: [4]
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#ASDF 0.1.0
#ASDF_STANDARD 0.1.0
#ASDF 1.0.0
#ASDF_STANDARD 1.0.0
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-0.1.0
asdf_library: !core/software-0.1.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 0.0.dev644}
my_stream: !core/ndarray-0.1.0
--- !core/asdf-1.0.0
asdf_library: !core/software-1.0.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 1.0.0}
my_stream: !core/ndarray-1.0.0
data:
- [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
- [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
Expand Down
Binary file not shown.
16 changes: 16 additions & 0 deletions reference_files/1.0.0/unicode_bmp.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#ASDF 1.0.0
#ASDF_STANDARD 1.0.0
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-1.0.0
asdf_library: !core/software-1.0.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 1.0.0}
datatype<U: !core/ndarray-1.0.0
data: ['', Æʩ]
datatype: [ucs4, 2]
shape: [2]
datatype>U: !core/ndarray-1.0.0
data: ['', Æʩ]
datatype: [ucs4, 2]
shape: [2]
...
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#ASDF 0.1.0
#ASDF_STANDARD 0.1.0
#ASDF 1.0.0
#ASDF_STANDARD 1.0.0
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-0.1.0
asdf_library: !core/software-0.1.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 0.0.dev644}
datatype<U: !core/ndarray-0.1.0
--- !core/asdf-1.0.0
asdf_library: !core/software-1.0.0 {author: Space Telescope Science Institute, homepage: 'http://github.com/spacetelescope/pyasdf',
name: pyasdf, version: 1.0.0}
datatype<U: !core/ndarray-1.0.0
data: ['', "\U00010020"]
datatype: [ucs4, 2]
shape: [2]
datatype>U: !core/ndarray-0.1.0
datatype>U: !core/ndarray-1.0.0
data: ['', "\U00010020"]
datatype: [ucs4, 2]
shape: [2]
Expand Down

0 comments on commit 4ceda98

Please sign in to comment.