Merge pull request #326 from WilliamJamieson/feature/remove_tag

asdf-format · Aug 8, 2022 · 0cffcb5 · 0cffcb5
2 parents d6966c1 + 2eb3768
commit 0cffcb5
Show file tree

Hide file tree

Showing 34 changed files with 8 additions and 37 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -11,6 +11,7 @@ The stable ASDF Standard is v1.5.0
 - Move packaging to ``pyproject.toml`` file from ``setup.cfg`` and ``setup.py``
   files. [#321]
 - Remove `tag` from within the `time-1.1.0` schema. [#323]
+- Remove `tag` from within the remaining schemas. [#326]
 
 1.0.2 (2022-04-15)
 ------------------

diff --git a/resources/schemas/stsci.edu/asdf/core/asdf-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/asdf-1.0.0.yaml
@@ -8,7 +8,6 @@ title: |
 description: |
   This schema contains the top-level attributes for every ASDF file.
 
-tag: "tag:stsci.edu:asdf/core/asdf-1.0.0"
 type: object
 properties:
   asdf_library:

diff --git a/resources/schemas/stsci.edu/asdf/core/asdf-1.1.0.yaml b/resources/schemas/stsci.edu/asdf/core/asdf-1.1.0.yaml
@@ -8,7 +8,6 @@ title: |
 description: |
   This schema contains the top-level attributes for every ASDF file.
 
-tag: "tag:stsci.edu:asdf/core/asdf-1.1.0"
 type: object
 properties:
   asdf_library:

diff --git a/resources/schemas/stsci.edu/asdf/core/column-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/column-1.0.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/core/column-1.0.0"
-tag: "tag:stsci.edu:asdf/core/column-1.0.0"
 
 title: >
   A column in a table.

diff --git a/resources/schemas/stsci.edu/asdf/core/complex-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/complex-1.0.0.yaml
@@ -39,7 +39,6 @@ examples:
     - -1 real, 0 imaginary
     - "!core/complex-1.0.0 -1"
 
-tag: "tag:stsci.edu:asdf/core/complex-1.0.0"
 type: string
 # This regex was automatically generated from a description of a grammar
 pattern: "^(((((([+-]?(([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN)))))|([+-]?(([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[eE][+-]?[0-9]+)))|([+-]?(((([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[iIjJ])|((([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[eE][+-]?[0-9]+[iIjJ])))|((([+-]?(([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN)))))|([+-]?(([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[eE][+-]?[0-9]+))[+-](((([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[iIjJ])|((([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[eE][+-]?[0-9]+[iIjJ])))))|(\\((((([+-]?(([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN)))))|([+-]?(([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[eE][+-]?[0-9]+)))|([+-]?(((([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[iIjJ])|((([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[eE][+-]?[0-9]+[iIjJ])))|((([+-]?(([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN)))))|([+-]?(([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[eE][+-]?[0-9]+))[+-](((([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[iIjJ])|((([0-9]+)|(\\.[0-9]+)|([0-9]+\\.[0-9]+)|(((inf)|(INF)))|(((nan)|(NAN))))[eE][+-]?[0-9]+[iIjJ]))))\\)))$"

diff --git a/resources/schemas/stsci.edu/asdf/core/constant-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/constant-1.0.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/core/constant-1.0.0"
-tag: "tag:stsci.edu:asdf/core/constant-1.0.0"
 title: Specify that a value is a constant.
 description: |
   Used as a utility to indicate that value is a literal constant.

diff --git a/resources/schemas/stsci.edu/asdf/core/extension_metadata-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/extension_metadata-1.0.0.yaml
@@ -7,7 +7,6 @@ title: |
 description: |
   Metadata about specific ASDF extensions that were used to create this file.
 
-tag: "tag:stsci.edu:asdf/core/extension_metadata-1.0.0"
 type: object
 properties:
   extension_class:

diff --git a/resources/schemas/stsci.edu/asdf/core/externalarray-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/externalarray-1.0.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/core/externalarray-1.0.0"
-tag: "tag:stsci.edu:asdf/core/externalarray-1.0.0"
 title: Point to an array-like object in an external file.
 description: |
   Allow referencing of array-like objects in external files. These files can be

diff --git a/resources/schemas/stsci.edu/asdf/core/history_entry-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/history_entry-1.0.0.yaml
@@ -8,7 +8,6 @@ description: |
   A record of an operation that has been performed
   upon a file.
 
-tag: "tag:stsci.edu:asdf/core/history_entry-1.0.0"
 type: object
 properties:
   description:

diff --git a/resources/schemas/stsci.edu/asdf/core/integer-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/integer-1.0.0.yaml
@@ -30,8 +30,6 @@ examples:
             datatype: uint32
             shape: [4]
 
-
-tag: "tag:stsci.edu:asdf/core/integer-1.0.0"
 type: object
 properties:
   words:

diff --git a/resources/schemas/stsci.edu/asdf/core/ndarray-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/ndarray-1.0.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/core/ndarray-1.0.0"
-tag: "tag:stsci.edu:asdf/core/ndarray-1.0.0"
 
 title: >
   An *n*-dimensional array.

diff --git a/resources/schemas/stsci.edu/asdf/core/software-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/software-1.0.0.yaml
@@ -7,7 +7,6 @@ title: |
 description: |
   General-purpose description of a software package.
 
-tag: "tag:stsci.edu:asdf/core/software-1.0.0"
 type: object
 properties:
   name:

diff --git a/resources/schemas/stsci.edu/asdf/core/subclass_metadata-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/subclass_metadata-1.0.0.yaml
@@ -8,7 +8,6 @@ description: |
   Identifies the specific subclass that was serialized,
   to enable ASDF readers to correctly deserialize the object.
 
-tag: "tag:stsci.edu:asdf/core/subclass_metadata-1.0.0"
 type: object
 properties:
   name:

diff --git a/resources/schemas/stsci.edu/asdf/core/table-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/core/table-1.0.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/core/table-1.0.0"
-tag: "tag:stsci.edu:asdf/core/table-1.0.0"
 
 title: >
   A table.

diff --git a/resources/schemas/stsci.edu/asdf/time/time-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/time/time-1.0.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/time/time-1.0.0"
-tag: "tag:stsci.edu:asdf/time/time-1.0.0"
 title: Represents an instance in time.
 description: |
   A "time" is a single instant in time.  It may explicitly specify the

diff --git a/resources/schemas/stsci.edu/asdf/time/time-1.2.0.yaml b/resources/schemas/stsci.edu/asdf/time/time-1.2.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/time/time-1.2.0"
-tag: "tag:stsci.edu:asdf/time/time-1.2.0"
 title: Represents an instance in time.
 description: |
   A "time" is a single instant in time.  It may explicitly specify the

diff --git a/resources/schemas/stsci.edu/asdf/unit/defunit-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/unit/defunit-1.0.0.yaml
@@ -12,7 +12,6 @@ description: |
 
   The new unit must be defined before any unit tags that use it.
 
-tag: "tag:stsci.edu:asdf/unit/defunit-1.0.0"
 type: object
 properties:
   name:

diff --git a/resources/schemas/stsci.edu/asdf/unit/quantity-1.1.0.yaml b/resources/schemas/stsci.edu/asdf/unit/quantity-1.1.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/unit/quantity-1.1.0"
-tag: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
 
 title: >
   Represents a Quantity object from astropy

diff --git a/resources/schemas/stsci.edu/asdf/unit/unit-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/unit/unit-1.0.0.yaml
@@ -15,10 +15,6 @@ examples:
     - |
       !unit/unit-1.0.0 "2.1798721 10-18kg m2 s-2"
 
-anyOf:
-  - tag: "tag:stsci.edu:asdf/unit/unit-1.0.0"
-  - {}
-
 type: string
 pattern: "[\x00-\x7f]*"
 ...
diff --git a/resources/schemas/stsci.edu/asdf/wcs/celestial_frame-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/celestial_frame-1.0.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/celestial_frame-1.0.0"
-tag: "tag:stsci.edu:asdf/wcs/celestial_frame-1.0.0"
 
 title: >
   Represents a celestial frame.

diff --git a/resources/schemas/stsci.edu/asdf/wcs/celestial_frame-1.1.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/celestial_frame-1.1.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/celestial_frame-1.1.0"
-tag: "tag:stsci.edu:asdf/wcs/celestial_frame-1.1.0"
 
 title: >
   Represents a celestial frame.

diff --git a/resources/schemas/stsci.edu/asdf/wcs/composite_frame-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/composite_frame-1.0.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/composite_frame-1.0.0"
-tag: "tag:stsci.edu:asdf/wcs/composite_frame-1.0.0"
 
 title: >
   Represents a set of frames.

diff --git a/resources/schemas/stsci.edu/asdf/wcs/composite_frame-1.1.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/composite_frame-1.1.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/composite_frame-1.1.0"
-tag: "tag:stsci.edu:asdf/wcs/composite_frame-1.1.0"
 
 title: >
   Represents a set of frames.

diff --git a/resources/schemas/stsci.edu/asdf/wcs/icrs_coord-1.1.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/icrs_coord-1.1.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/icrs_coord-1.1.0"
-tag: "tag:stsci.edu:asdf/wcs/icrs_coord-1.1.0"
 
 title: |
   Represents an ICRS coordinate object from astropy

diff --git a/resources/schemas/stsci.edu/asdf/wcs/spectral_frame-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/spectral_frame-1.0.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/spectral_frame-1.0.0"
-tag: "tag:stsci.edu:asdf/wcs/spectral_frame-1.0.0"
 
 title: >
   Represents a spectral frame.

diff --git a/resources/schemas/stsci.edu/asdf/wcs/spectral_frame-1.1.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/spectral_frame-1.1.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/spectral_frame-1.1.0"
-tag: "tag:stsci.edu:asdf/wcs/spectral_frame-1.1.0"
 
 title: >
   Represents a spectral frame.

diff --git a/resources/schemas/stsci.edu/asdf/wcs/step-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/step-1.0.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/step-1.0.0"
-tag: "tag:stsci.edu:asdf/wcs/step-1.0.0"
 title: >
   Describes a single step of a WCS transform pipeline.
 description: >

diff --git a/resources/schemas/stsci.edu/asdf/wcs/step-1.1.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/step-1.1.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/step-1.1.0"
-tag: "tag:stsci.edu:asdf/wcs/step-1.1.0"
 title: >
   Describes a single step of a WCS transform pipeline.
 description: >

diff --git a/resources/schemas/stsci.edu/asdf/wcs/step-1.2.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/step-1.2.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/step-1.2.0"
-tag: "tag:stsci.edu:asdf/wcs/step-1.2.0"
 title: >
   Describes a single step of a WCS transform pipeline.
 description: >

diff --git a/resources/schemas/stsci.edu/asdf/wcs/wcs-1.0.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/wcs-1.0.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/wcs-1.0.0"
-tag: "tag:stsci.edu:asdf/wcs/wcs-1.0.0"
 title: >
   A system for describing generalized world coordinate transformations.
 description: >

diff --git a/resources/schemas/stsci.edu/asdf/wcs/wcs-1.1.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/wcs-1.1.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/wcs-1.1.0"
-tag: "tag:stsci.edu:asdf/wcs/wcs-1.1.0"
 title: >
   A system for describing generalized world coordinate transformations.
 description: >

diff --git a/resources/schemas/stsci.edu/asdf/wcs/wcs-1.2.0.yaml b/resources/schemas/stsci.edu/asdf/wcs/wcs-1.2.0.yaml
@@ -2,7 +2,6 @@
 ---
 $schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
 id: "http://stsci.edu/schemas/asdf/wcs/wcs-1.2.0"
-tag: "tag:stsci.edu:asdf/wcs/wcs-1.2.0"
 title: >
   A system for describing generalized world coordinate transformations.
 description: >

diff --git a/tests/test_manifests.py b/tests/test_manifests.py
@@ -21,7 +21,12 @@ def test_manifest(path, tag_to_schema):
     assert "description" in manifest
 
     for tag in manifest["tags"]:
-        if "time-1.1.0" not in tag["tag_uri"]:
+        if (
+            "time" not in tag["tag_uri"]
+            and "core" not in tag["tag_uri"]
+            and "unit" not in tag["tag_uri"]
+            and "wcs" not in tag["tag_uri"]
+        ):
             assert tag["tag_uri"] in tag_to_schema
             schema = tag_to_schema[tag["tag_uri"]][0]
             assert tag["schema_uri"] == schema["id"]

diff --git a/tests/test_version_map.py b/tests/test_version_map.py
@@ -35,7 +35,7 @@ def test_version_map(path, schema_tags):
 
     for tag_base, tag_version in vm["tags"].items():
         tag = f"{tag_base}-{tag_version}"
-        if "time-1.1.0" not in tag:
+        if "time" not in tag and "core" not in tag and "unit" not in tag and "wcs" not in tag:
             assert tag in schema_tags, f"{path.name} specifies missing tag {tag}"
 
     assert len(vm["tags"].keys()) == len(set(vm["tags"].keys())), f"{path.name} contains duplicate tags"