diff --git a/asdf_astropy/converters/__init__.py b/asdf_astropy/converters/__init__.py index 4cb722fb..f2536557 100644 --- a/asdf_astropy/converters/__init__.py +++ b/asdf_astropy/converters/__init__.py @@ -54,6 +54,7 @@ SpectralCoordConverter, ) from .fits import AsdfFitsConverter, AstropyFitsConverter, FitsConverter +from .nddata import StdDevUncertaintyConverter, UnknownUncertaintyConverter from .table import AsdfTableConverter, AstropyTableConverter, ColumnConverter, NdarrayMixinConverter from .time import TimeConverter, TimeDeltaConverter from .transform import ( @@ -75,5 +76,4 @@ TransformConverterBase, UnitsMappingConverter, ) -from .uncertainty import StdDevUncertaintyConverter, UnknownUncertaintyConverter from .unit import EquivalencyConverter, MagUnitConverter, QuantityConverter, UnitConverter diff --git a/asdf_astropy/converters/uncertainty/__init__.py b/asdf_astropy/converters/nddata/__init__.py similarity index 100% rename from asdf_astropy/converters/uncertainty/__init__.py rename to asdf_astropy/converters/nddata/__init__.py diff --git a/asdf_astropy/converters/uncertainty/tests/__init__.py b/asdf_astropy/converters/nddata/tests/__init__.py similarity index 100% rename from asdf_astropy/converters/uncertainty/tests/__init__.py rename to asdf_astropy/converters/nddata/tests/__init__.py diff --git a/asdf_astropy/converters/uncertainty/tests/test_uncertainty.py b/asdf_astropy/converters/nddata/tests/test_uncertainty.py similarity index 100% rename from asdf_astropy/converters/uncertainty/tests/test_uncertainty.py rename to asdf_astropy/converters/nddata/tests/test_uncertainty.py diff --git a/asdf_astropy/converters/uncertainty/uncertainty.py b/asdf_astropy/converters/nddata/uncertainty.py similarity index 88% rename from asdf_astropy/converters/uncertainty/uncertainty.py rename to asdf_astropy/converters/nddata/uncertainty.py index ce951f1b..ae4d6802 100644 --- a/asdf_astropy/converters/uncertainty/uncertainty.py +++ b/asdf_astropy/converters/nddata/uncertainty.py @@ -13,7 +13,7 @@ def to_yaml_tree(self, nddata_uncertainty, tag, ctx): class StdDevUncertaintyConverter(_UncertaintyBaseConverter): - tags = ("tag:astropy.org:astropy/uncertainty/stddevuncertainty-*",) + tags = ("tag:astropy.org:astropy/nddata/stddevuncertainty-*",) types = ("astropy.nddata.nduncertainty.StdDevUncertainty",) def from_yaml_tree(self, node, tag, ctx): @@ -24,7 +24,7 @@ def from_yaml_tree(self, node, tag, ctx): class UnknownUncertaintyConverter(_UncertaintyBaseConverter): - tags = ("tag:astropy.org:astropy/uncertainty/unknownuncertainty-*",) + tags = ("tag:astropy.org:astropy/nddata/unknownuncertainty-*",) types = ("astropy.nddata.nduncertainty.UnknownUncertainty",) def from_yaml_tree(self, node, tag, ctx): diff --git a/asdf_astropy/extensions.py b/asdf_astropy/extensions.py index 16bfeea2..f574dc44 100644 --- a/asdf_astropy/extensions.py +++ b/asdf_astropy/extensions.py @@ -12,6 +12,7 @@ from .converters.coordinates.sky_coord import SkyCoordConverter from .converters.coordinates.spectral_coord import SpectralCoordConverter from .converters.fits.fits import AsdfFitsConverter, AstropyFitsConverter +from .converters.nddata.uncertainty import StdDevUncertaintyConverter, UnknownUncertaintyConverter from .converters.table.table import AsdfTableConverter, AstropyTableConverter, ColumnConverter, NdarrayMixinConverter from .converters.time.time import TimeConverter from .converters.time.time_delta import TimeDeltaConverter @@ -26,7 +27,6 @@ from .converters.transform.rotations import Rotate3DConverter, RotationSequenceConverter from .converters.transform.spline import SplineConverter from .converters.transform.tabular import TabularConverter -from .converters.uncertainty.uncertainty import StdDevUncertaintyConverter, UnknownUncertaintyConverter from .converters.unit.equivalency import EquivalencyConverter from .converters.unit.magunit import MagUnitConverter from .converters.unit.quantity import QuantityConverter diff --git a/asdf_astropy/resources/manifests/astropy-1.0.0.yaml b/asdf_astropy/resources/manifests/astropy-1.0.0.yaml index c0ed2cc1..4f6d25b7 100644 --- a/asdf_astropy/resources/manifests/astropy-1.0.0.yaml +++ b/asdf_astropy/resources/manifests/astropy-1.0.0.yaml @@ -49,18 +49,3 @@ tags: This transform operates on the units of the input, first converting to the expected input units, then assigning replacement output units without further conversion. -- tag_uri: tag:astropy.org:astropy/uncertainty/uncertainty-1.0.0 - schema_uri: http://astropy.org/schemas/astropy/uncertainty/uncertainty-1.0.0 - title: Represent the nddata.uncertainty.NDUncertainty object - description: |- - Represents an instance of the nddata.uncertainty.NDUncertainty object -- tag_uri: tag:astropy.org:astropy/uncertainty/unknownuncertainty-1.0.0 - schema_uri: http://astropy.org/schemas/astropy/uncertainty/unknownuncertainty-1.0.0 - title: Represent the nddata.uncertainty.UnknownUncertainty object - description: |- - Represents an instance of the nddata.uncertainty.UnknownUncertainty object -- tag_uri: tag:astropy.org:astropy/uncertainty/stddevuncertainty-1.0.0 - schema_uri: http://astropy.org/schemas/astropy/uncertainty/stddevuncertainty-1.0.0 - title: Represent the nddata.uncertainty.StdDevUncertainty object - description: |- - Represents an instance of the nddata.uncertainty.StdDevUncertainty object diff --git a/asdf_astropy/resources/manifests/astropy-1.2.0.yaml b/asdf_astropy/resources/manifests/astropy-1.2.0.yaml index 696f8f4b..c5f0ca27 100644 --- a/asdf_astropy/resources/manifests/astropy-1.2.0.yaml +++ b/asdf_astropy/resources/manifests/astropy-1.2.0.yaml @@ -54,13 +54,13 @@ tags: title: NdarrayMixin column. description: |- Represents an astropy.table.NdarrayMixin instance. -- tag_uri: tag:astropy.org:astropy/uncertainty/unknownuncertainty-1.0.0 - schema_uri: http://astropy.org/schemas/astropy/uncertainty/unknownuncertainty-1.0.0 +- tag_uri: tag:astropy.org:astropy/nddata/unknownuncertainty-1.0.0 + schema_uri: http://astropy.org/schemas/astropy/nddata/unknownuncertainty-1.0.0 title: Represent the nddata.uncertainty.UnknownUncertainty object description: |- Represents an instance of the nddata.uncertainty.UnknownUncertainty object -- tag_uri: tag:astropy.org:astropy/uncertainty/stddevuncertainty-1.0.0 - schema_uri: http://astropy.org/schemas/astropy/uncertainty/stddevuncertainty-1.0.0 +- tag_uri: tag:astropy.org:astropy/nddata/stddevuncertainty-1.0.0 + schema_uri: http://astropy.org/schemas/astropy/nddata/stddevuncertainty-1.0.0 title: Represent the nddata.uncertainty.StdDevUncertainty object description: |- Represents an instance of the nddata.uncertainty.StdDevUncertainty object diff --git a/asdf_astropy/resources/manifests/astropy-1.3.0.yaml b/asdf_astropy/resources/manifests/astropy-1.3.0.yaml index 161a7c16..630406bc 100644 --- a/asdf_astropy/resources/manifests/astropy-1.3.0.yaml +++ b/asdf_astropy/resources/manifests/astropy-1.3.0.yaml @@ -54,13 +54,13 @@ tags: title: NdarrayMixin column. description: |- Represents an astropy.table.NdarrayMixin instance. -- tag_uri: tag:astropy.org:astropy/uncertainty/unknownuncertainty-1.0.0 - schema_uri: http://astropy.org/schemas/astropy/uncertainty/unknownuncertainty-1.0.0 +- tag_uri: tag:astropy.org:astropy/nddata/unknownuncertainty-1.0.0 + schema_uri: http://astropy.org/schemas/astropy/nddata/unknownuncertainty-1.0.0 title: Represent the nddata.uncertainty.UnknownUncertainty object description: |- Represents an instance of the nddata.uncertainty.UnknownUncertainty object -- tag_uri: tag:astropy.org:astropy/uncertainty/stddevuncertainty-1.0.0 - schema_uri: http://astropy.org/schemas/astropy/uncertainty/stddevuncertainty-1.0.0 +- tag_uri: tag:astropy.org:astropy/nddata/stddevuncertainty-1.0.0 + schema_uri: http://astropy.org/schemas/astropy/nddata/stddevuncertainty-1.0.0 title: Represent the nddata.uncertainty.StdDevUncertainty object description: |- Represents an instance of the nddata.uncertainty.StdDevUncertainty object diff --git a/asdf_astropy/resources/schemas/uncertainty/stddevuncertainty-1.0.0.yaml b/asdf_astropy/resources/schemas/nddata/stddevuncertainty-1.0.0.yaml similarity index 86% rename from asdf_astropy/resources/schemas/uncertainty/stddevuncertainty-1.0.0.yaml rename to asdf_astropy/resources/schemas/nddata/stddevuncertainty-1.0.0.yaml index 0e3490af..bf288538 100644 --- a/asdf_astropy/resources/schemas/uncertainty/stddevuncertainty-1.0.0.yaml +++ b/asdf_astropy/resources/schemas/nddata/stddevuncertainty-1.0.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "http://astropy.org/schemas/astropy/uncertainty/stddevuncertainty-1.0.0" +id: "http://astropy.org/schemas/astropy/nddata/stddevuncertainty-1.0.0" title: Represents the astropy.nddata.StdDevUncertainty class diff --git a/asdf_astropy/resources/schemas/uncertainty/unknownuncertainty-1.0.0.yaml b/asdf_astropy/resources/schemas/nddata/unknownuncertainty-1.0.0.yaml similarity index 86% rename from asdf_astropy/resources/schemas/uncertainty/unknownuncertainty-1.0.0.yaml rename to asdf_astropy/resources/schemas/nddata/unknownuncertainty-1.0.0.yaml index 62f6c6a8..ee8b9983 100644 --- a/asdf_astropy/resources/schemas/uncertainty/unknownuncertainty-1.0.0.yaml +++ b/asdf_astropy/resources/schemas/nddata/unknownuncertainty-1.0.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "http://astropy.org/schemas/astropy/uncertainty/unknownuncertainty-1.0.0" +id: "http://astropy.org/schemas/astropy/nddata/unknownuncertainty-1.0.0" title: Represents the astropy.nddata.UnknownUncertainty class diff --git a/asdf_astropy/resources/schemas/uncertainty/uncertainty-1.0.0.yaml b/asdf_astropy/resources/schemas/uncertainty/uncertainty-1.0.0.yaml deleted file mode 100644 index af03a01b..00000000 --- a/asdf_astropy/resources/schemas/uncertainty/uncertainty-1.0.0.yaml +++ /dev/null @@ -1,21 +0,0 @@ -%YAML 1.1 ---- -$schema: "http://stsci.edu/schemas/yaml-schema/draft-01" -id: "http://astropy.org/schemas/astropy/uncertainty/uncertainty-1.0.0" - -title: - Represents the astropy.nddata.NDUncertainty object - -description: - Represents the astropy.nddata.NDUncertainty object - -allOf: - - tag: "tag:astropy.org:astropy/uncertainty/uncertainty-1.0.0" - - type: object - properties: - array: - type: object - unit: - anyOf: - - tag: "tag:stsci.edu:asdf/unit/unit-*" - - tag: "tag:astropy.org:astropy/units/unit-1.*"