Rebased

.pre-commit-config.yaml

@@ -40,18 +40,18 @@ repos:
       args: ["--py38-plus"]
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: 'v0.1.7'
+  rev: 'v0.1.13'
   hooks:
     - id: ruff
       args: ["--fix"]
 
 - repo: https://github.com/pycqa/isort
-  rev: 5.13.0
+  rev: 5.13.2
   hooks:
     - id: isort
 
 - repo: https://github.com/psf/black
-  rev: 23.11.0
+  rev: 23.12.1
   hooks:
     - id: black
 

CHANGES.rst

@@ -7,6 +7,8 @@ A0.18.1 (unreleased)
 - Remove the unused ``variance-1.0.0`` schema. [#344]
 >>>>>>> 274a10bbc4c95d8835d926192f3da032c079883c
 
+- Add wcs tag to wfi_image and wfi_mosaic schemas. [#351]
+
 0.18.0 (2023-11-06)
 -------------------
 

src/rad/resources/schemas/wfi_image-1.0.0.yaml

@@ -16,11 +16,16 @@ properties:
       - $ref: common-1.0.0
       - type: object
         properties:
+          wcs:
+            title: WCS object
+            anyOf:
+              - tag: tag:stsci.edu:gwcs/wcs-*
+              - type: "null"
           photometry:
             tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0
           source_detection:
             tag: asdf://stsci.edu/datamodels/roman/tags/source_detection-1.0.0
-        required: [photometry]
+        required: [photometry, wcs]
   data:
     title: Science data, excluding border reference pixels.
     tag: tag:stsci.edu:asdf/unit/quantity-1.1.0

src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml

@@ -25,9 +25,12 @@ properties:
             tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0
           resample:
             tag: asdf://stsci.edu/datamodels/roman/tags/resample-1.0.0
-          wcsinfo:
-            tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0
-        required: [basic, individual_image_meta, program, resample, wcsinfo]
+          wcs:
+            title: WCS object
+            anyOf:
+              - tag: tag:stsci.edu:gwcs/wcs-*
+              - type: "null"
+        required: [basic, individual_image_meta, program, resample, wcs]
   data:
     title: Science data, excluding border reference pixels.
     tag: tag:stsci.edu:asdf/unit/quantity-1.1.0

tests/test_schemas.py

@@ -51,6 +51,10 @@ def valid_tag_uris(manifest):
             "tag:stsci.edu:asdf/unit/quantity-1.1.0",
             "tag:stsci.edu:asdf/unit/unit-1.0.0",
             "tag:astropy.org:astropy/units/unit-1.0.0",
+            "tag:stsci.edu:gwcs/wcs-1.0.0",
+            "tag:stsci.edu:gwcs/wcs-1.1.0",
+            "tag:stsci.edu:gwcs/wcs-1.2.0",
+            "tag:stsci.edu:gwcs/wcs-*",
         ]
     )
     return uris