restrict allOf to unit

Author: braingram

resources/schemas/earthlocation-1.2.0.yaml

@@ -14,21 +14,15 @@ properties:
   x:
     description: |
       X component of location in geocentric representation
-    anyOf:
-      - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-      - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+    tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
   y:
     description: |
       Y component of location in geocentric representation
-    anyOf:
-      - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-      - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+    tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
   z:
     description: |
       Z component of location in geocentric representation
-    anyOf:
-      - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-      - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+    tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
   ellipsoid:
     description: |
       Reference ellipsoid that is used when representing geodetic coordinates.

resources/schemas/frames/galactocentric-1.2.0.yaml

@@ -44,19 +44,13 @@ allOf:
           galacen_coord:
             tag: "tag:astropy.org:astropy/coordinates/frames/icrs-1.*"
           galcen_distance:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           galcen_v_sun:
             tag: "tag:astropy.org:astropy/coordinates/representation-1.*"
           z_sun:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           roll:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
         required: [galcen_coord, galcen_distance, galcen_v_sun, z_sun, roll]
 ...

resources/schemas/representation-1.2.0.yaml

@@ -62,17 +62,11 @@ properties:
       - type: object
         properties:
           x:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           y:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           z:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # SphericalRepresentation
       - type: object
@@ -82,9 +76,7 @@ properties:
           lon:
             tag: "tag:astropy.org:astropy/coordinates/longitude-1.*"
           distance:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # UnitSphericalRepresentation
       - type: object
@@ -98,9 +90,7 @@ properties:
       - type: object
         properties:
           distance:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # PhysicsSphericalRepresentation
       - type: object
@@ -110,167 +100,109 @@ properties:
           theta:
             tag: "tag:astropy.org:astropy/coordinates/angle-1.*"
           r:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # CylindricalRepresentation
       - type: object
         properties:
           rho:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           phi:
             tag: "tag:astropy.org:astropy/coordinates/angle-1.*"
           z:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # CartesianDifferential
       - type: object
         properties:
           d_x:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_y:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_z:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # SphericalDifferential
       - type: object
         properties:
           d_lon:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_lat:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_distance:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # UnitSphericalCosLatDifferential
       - type: object
         properties:
           d_lon_coslat:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_lat:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # UnitSphericalDifferential
       - type: object
         properties:
           d_lon:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_lat:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # SphericalCosLatDifferential
       - type: object
         properties:
           d_lon_coslat:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_lat:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_distance:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # SphericalDifferential
       - type: object
         properties:
           d_lon:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_lat:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_distance:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # RadialDifferential
       - type: object
         properties:
           d_phi:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_theta:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_r:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # PhysicsSphericalDifferential
       - type: object
         properties:
           d_phi:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_theta:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_r:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # RadialDifferential
       - type: object
         properties:
           d_distance:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
       # CylindricalDifferential
       - type: object
         properties:
           d_rho:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_phi:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           d_z:
-            anyOf:
-              - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
-              - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+            tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
 
 required: [type, components]
 ...

tests/test_schemas.py

@@ -9,7 +9,6 @@
     r"^#.*$",
 )
 
-QUANTITY_TAGS = {"tag:stsci.edu:asdf/unit/quantity-1.*", "tag:astropy.org:astropy/units/quantity-1.*"}
 UNIT_TAGS = {"tag:stsci.edu:asdf/unit/unit-1.*", "tag:astropy.org:astropy/units/unit-1.*"}
 
 
@@ -35,10 +34,10 @@ def test_wildcard_tags(latest_schema):
                 assert False, f"tag pattern missing wildcard: {pattern}"
 
 
-@pytest.mark.parametrize("tag_set", (QUANTITY_TAGS, UNIT_TAGS))
+@pytest.mark.parametrize("tag_set", (UNIT_TAGS,))
 def test_tags_in_allof(latest_schema, tag_set):
     """
-    Test that some tags (quantity and unit) where the
+    Test that some tags (unit) where the
     tag used depends on the value are always referenced in an
     allof containing all tags.
     """