Merge pull request #66 from braingram/ci

Re-enable and fix CI

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

@@ -16,8 +16,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
@@ -49,22 +55,22 @@ jobs:
             toxenv: codestyle
 
           - name: macOS
-            python-version: 3.11
+            python-version: 3.13
             os: macos-latest
-            toxenv: py39
+            toxenv: py313
 
           - name: Windows
-            python-version: 3.11
+            python-version: 3.13
             os: windows-latest
-            toxenv: py39
+            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
@@ -79,21 +85,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout asdf-coordinates-schemas
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           path: asdf-coordinates-schemas
       - name: Checkout asdf-astropy dev
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           repository: astropy/asdf-astropy
           ref: main
           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-coordinates-schemas
         run: cd asdf-coordinates-schemas && pip install .
       - name: Install asdf-astropy

docs/_static/custom.css

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

pyproject.toml

@@ -3,15 +3,11 @@ name = 'asdf_coordinates_schemas'
 description = 'ASDF schemas for coordinates'
 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',
     'Intended Audience :: Science/Research',
     'Topic :: Scientific/Engineering :: Astronomy',
@@ -49,7 +45,7 @@ test = [
 
 [build-system]
 requires = [
-    "setuptools>=60",
+    "setuptools>77",
     "setuptools_scm[toml]>=3.4",
     "wheel"
 ]

resources/schemas/spectralcoord-1.2.0.yaml

@@ -23,10 +23,10 @@ properties:
   observer:
     description: |
       The observer frame for this coordinate
-    $ref: "baseframe-1.2.0"
+    $ref: "frames/baseframe-1.2.0"
   target:
     description: |
       The target frame for this coordinate
-    $ref: "baseframe-1.2.0"
+    $ref: "frames/baseframe-1.2.0"
 required: [value, unit]
 ...

tests/conftest.py

@@ -1,10 +1,9 @@
 from pathlib import Path
 
+import asdf
 import pytest
 import yaml
 
-import asdf
-
 
 def get_latest_schema_uris(resource_paths):
     by_base_uri = {}
@@ -36,6 +35,7 @@ def get_latest_schema_uris(resource_paths):
 def resource_path(request):
     yield request.param
 
+
 @pytest.fixture(params=SCHEMA_PATHS)
 def schema_path(request):
     yield request.param

tests/test_manifests.py

@@ -4,7 +4,6 @@
 """
 
 import asdf
-import pytest
 import yaml
 
 

tests/test_schemas.py

@@ -2,10 +2,9 @@
 
 import asdf
 
-import pytest
-
 ALLOWED_REFS = (
     r"^baseframe-[0-9.]+$",
+    r"^frames/baseframe-[0-9.]+$",
     r"^#.*$",
 )
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist= py39,py310,py311,py312,twine,black,flake8,bandit
+envlist= py39,py310,py311,py312,py313,twine,black,flake8,bandit
 isolated_build = True
 
 [testenv]