Merge pull request #122 from braingram/ci

Fix CI and quantity tag bugs

Author: braingram

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions (main)
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "main"
+    schedule:
+      interval: "weekly"
+
+  # Maintain dependencies for pip (main)
+  - package-ecosystem: "pip"
+    directory: "/"
+    target-branch: "main"
+    schedule:
+      interval: "weekly"

.github/workflows/changelog.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true

.github/workflows/ci.yml

@@ -18,8 +18,14 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         include:
+          - name: Python 3.13 Schema validation tests
+            python-version: '3.13'
+            os: ubuntu-latest
+            toxenv: py313
+
           - name: Python 3.12 Schema validation tests
             python-version: '3.12'
             os: ubuntu-latest
@@ -28,7 +34,7 @@ jobs:
           - name: Python 3.11 Schema validation tests
             python-version: '3.11'
             os: ubuntu-latest
-            toxenv: py310
+            toxenv: py311
 
           - name: Python 3.10 Schema validation tests
             python-version: '3.10'
@@ -51,22 +57,22 @@ jobs:
             toxenv: codestyle
 
           - name: macOS
-            python-version: 3.11
+            python-version: 3.13
             os: macos-latest
-            toxenv: py311
+            toxenv: py312
 
           - name: Windows
-            python-version: 3.11
+            python-version: 3.13
             os: windows-latest
-            toxenv: py311
+            toxenv: py313
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install tox
@@ -81,20 +87,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout asdf-transform-schemas
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           path: asdf-transform-schemas
       - name: Checkout asdf-astropy dev
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           repository: astropy/asdf-astropy
           path: asdf-astropy
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.13
       - name: Install asdf-transform-schemas
         run: cd asdf-transform-schemas && pip install .
       - name: Install asdf-astropy

.github/workflows/downstream.yml

@@ -70,21 +70,21 @@ jobs:
             test_command: pytest
     steps:
       - name: Checkout asdf-transform-schemas
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true
           path: asdf-transform-schemas
       - name: Checkout ${{ matrix.package_name }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           repository: ${{ matrix.repository }}
           path: target
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.13
       - name: Install asdf-transform-schemas
         run: cd asdf-transform-schemas && pip install .
       - name: Install remaining ${{ matrix.package_name }} dependencies

docs/_static/custom.css

@@ -47,7 +47,7 @@ div.highlight-python:active {
 .announcement-content a {
     padding-right: 1em;
   }
-  
+
 .announcement-content a:hover {
   color: fuchsia;
 }

docs/conf.py

@@ -139,7 +139,7 @@
 html_theme_options = {
     "light_logo": "images/logo-light-mode.png",
     "dark_logo": "images/logo-dark-mode.png",
-    "announcement": topbanner, 
+    "announcement": topbanner,
 }
 
 
@@ -198,5 +198,6 @@
 # This is the prefix common to all schema IDs in this repository
 asdf_schema_standard_prefix = "schemas"
 
+
 def setup(app):
     app.add_css_file("custom.css")

pyproject.toml

@@ -3,15 +3,11 @@ name = 'asdf_transform_schemas'
 description = 'ASDF schemas for transforms'
 readme = 'README.md'
 requires-python = '>=3.9'
-license = { file = 'LICENSE' }
+license-files = ['LICENSE']
 authors = [{ name = 'The ASDF Developers', email = 'help@stsci.edu' }]
 classifiers = [
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.9',
-    'Programming Language :: Python :: 3.10',
-    'Programming Language :: Python :: 3.11',
-    'Programming Language :: Python :: 3.12',
     'Development Status :: 5 - Production/Stable',
 ]
 dependencies = [
@@ -48,7 +44,7 @@ test = [
 
 [build-system]
 requires = [
-    "setuptools >=42",
+    "setuptools >77",
     "setuptools_scm[toml] >=3.4",
     "wheel",
 ]

resources/stsci.edu/schemas/affine-1.5.0.yaml

@@ -20,6 +20,7 @@ allOf:
         anyOf:
           - tag: "tag:stsci.edu:asdf/core/ndarray-1.*"
           - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           - type: array
             items:
               type: array
@@ -36,6 +37,7 @@ allOf:
         anyOf:
           - tag: "tag:stsci.edu:asdf/core/ndarray-1.*"
           - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           - type: array
             items:
               type: number

resources/stsci.edu/schemas/airy-1.4.0.yaml

@@ -19,6 +19,7 @@ allOf:
       theta_b:
         anyOf:
           - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           - type: number
         description: |
           The latitude $\theta_b$ at which to minimize the error, in

resources/stsci.edu/schemas/airy_disk2d-1.2.0.yaml

@@ -21,21 +21,25 @@ allOf:
       amplitude:
         anyOf:
           - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           - type: number
         description: Amplitude of the Airy function.
       x_0:
         anyOf:
           - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           - type: number
         description: x position of the maximum of the Airy function.
       y_0:
         anyOf:
           - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           - type: number
         description: y position of the maximum of the Airy function.
       radius:
         anyOf:
           - tag: "tag:astropy.org:astropy/units/quantity-1.*"
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.*"
           - type: number
         description: The radius of the Airy disk (radius of the first zero).