try to fix doc build, define matricies in one place

d-chambers · d-chambers · commit d39bd0e045dd · 2025-12-22T10:55:42.000-07:00
diff --git a/.github/actions/load-shared-vars/action.yml b/.github/actions/load-shared-vars/action.yml
@@ -1,40 +1,64 @@
 name: "Load Shared Variables"
-description: "Loads shared variables from .github/shared-vars.yml and sets them as environment variables"
+description: "Loads shared variables from .github/shared-vars.yml and sets them as environment variables and outputs"
+
+outputs:
+  test-matrix:
+    description: "Python version matrix for full tests"
+    value: ${{ steps.load.outputs.test-matrix }}
+  min-deps-matrix:
+    description: "Python version matrix for minimum dependency tests"
+    value: ${{ steps.load.outputs.min-deps-matrix }}
 
 runs:
   using: "composite"
   steps:
     - name: load shared variables
+      id: load
       shell: bash
       run: |
         # Read shared-vars.yml and set environment variables
         python << 'EOF'
         import yaml
         import os
+        import json
+
+        def flatten_dict(d, parent_key='', sep='_'):
+            """Recursively flatten nested dictionary into env var format."""
+            items = []
+            for k, v in d.items():
+                new_key = f"{parent_key}{sep}{k}".upper() if parent_key else k.upper()
+                if isinstance(v, dict):
+                    items.extend(flatten_dict(v, new_key, sep=sep).items())
+                elif isinstance(v, list):
+                    # Convert lists to JSON strings for use in workflows
+                    items.append((new_key, json.dumps(v)))
+                else:
+                    items.append((new_key, str(v)))
+            return dict(items)
 
         # Load shared variables file
         with open('.github/shared-vars.yml', 'r') as f:
             config = yaml.safe_load(f)
 
-        # Set Python version environment variables
-        python_config = config.get('python', {})
-
-        env_vars = {
-            'PYTHON_DEFAULT': python_config.get('default', '3.12'),
-            'PYTHON_LATEST': python_config.get('latest', '3.13'),
-            'PYTHON_RELEASE': python_config.get('release', '3.11'),
-        }
+        # Flatten all variables
+        env_vars = flatten_dict(config)
 
         # Write to GITHUB_ENV
         with open(os.environ['GITHUB_ENV'], 'a') as env_file:
-            for key, value in env_vars.items():
+            for key, value in sorted(env_vars.items()):
                 env_file.write(f"{key}={value}\n")
                 print(f"✅ Set {key}={value}")
 
-        # For matrix values, we can't set them directly in env
-        # Workflows will need to read the file directly for matrix strategy
+        # Also output specific matrices for job outputs
+        python_config = config.get('python', {})
         test_matrix = python_config.get('test_matrix', [])
         min_deps_matrix = python_config.get('min_deps_matrix', [])
-        print(f"📋 Test matrix available: {test_matrix}")
-        print(f"📋 Min deps matrix available: {min_deps_matrix}")
+
+        # Write to GITHUB_OUTPUT for action outputs
+        with open(os.environ['GITHUB_OUTPUT'], 'a') as output_file:
+            output_file.write(f"test-matrix={json.dumps(test_matrix)}\n")
+            output_file.write(f"min-deps-matrix={json.dumps(min_deps_matrix)}\n")
+
+        print(f"📋 Output test-matrix: {test_matrix}")
+        print(f"📋 Output min-deps-matrix: {min_deps_matrix}")
         EOF
diff --git a/.github/doc_environment.yml b/.github/doc_environment.yml
@@ -2,7 +2,6 @@ name: dascore
 channels:
   - conda-forge
 dependencies:
-  - python=3.12
   - pytest
   - pydantic>2.0
   - pip
diff --git a/.github/shared-vars.yml b/.github/shared-vars.yml
@@ -5,4 +5,16 @@ python:
   # Default Python version for most workflows (docs, linting, coverage, etc.)
   default: "3.13"
 
+  # Full test matrix versions (runtests.yml)
+  test_matrix:
+    - "3.11"
+    - "3.12"
+    - "3.13"
+    - "3.14"
+
+  # Minimum dependency test matrix versions (run_min_dep_tests.yml)
+  min_deps_matrix:
+    - "3.13"
+    - "3.14"
+
 # Add other shared variables here as needed
diff --git a/.github/workflows/run_min_dep_tests.yml b/.github/workflows/run_min_dep_tests.yml
@@ -23,15 +23,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  # Load Python version matrix from shared-vars.yml
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      python-matrix: ${{ steps.load-vars.outputs.min-deps-matrix }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/load-shared-vars
+        id: load-vars
+
   # Runs the tests on combinations of the supported python/os matrix.
   test_code_min_deps:
-
+    needs: setup
     timeout-minutes: 25
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        python-version: [ '3.13', '3.14' ]
+        python-version: ${{ fromJson(needs.setup.outputs.python-matrix) }}
 
     # only run if CI isn't turned off
     if: github.event_name == 'push' || !contains(github.event.pull_request.labels.*.name, 'no_ci')
diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml
@@ -25,15 +25,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  # Load Python version matrix from shared-vars.yml
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      python-matrix: ${{ steps.load-vars.outputs.test-matrix }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/load-shared-vars
+        id: load-vars
+
   # Runs the tests on combinations of the supported python/os matrix.
   test_code:
-
+    needs: setup
     timeout-minutes: 25
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.11', '3.12', '3.13', '3.14' ]
+        python-version: ${{ fromJson(needs.setup.outputs.python-matrix) }}
 
     # only run if CI isn't turned off
     if: github.event_name == 'push' || !contains(github.event.pull_request.labels.*.name, 'no_ci')
