rename and reorder

spacetelescope · Jan 24, 2024 · 5249862 · 5249862
1 parent 2c6f8d1
commit 5249862
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -26,7 +26,6 @@ defaults:
 
 jobs:
   date:
-    name: get current date
     runs-on: ubuntu-latest
     steps:
       - run: echo "date=$(date +%Y-%m-%d)" >> $GITHUB_OUTPUT
@@ -35,14 +34,14 @@ jobs:
     outputs:
       date: ${{ steps.date.outputs.date }}
   build:
-    name: build (py${{ matrix.python-version }}, ${{ matrix.runs-on }})
     needs: [ date ]
-    runs-on: ${{ matrix.runs-on }}
     strategy:
       fail-fast: false
       matrix:
         runs-on: [ ubuntu-latest, macos-latest ]
         python-version: [ '3.9', '3.10', '3.11' ]
+    runs-on: ${{ matrix.runs-on }}
+    name: build (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})
     steps:
       - uses: actions/checkout@v4
       - uses: mamba-org/setup-micromamba@v1
@@ -61,8 +60,8 @@ jobs:
       - run: conda env export --no-build | grep -v "name:" | grep -v "prefix:"
       - run: pytest -n auto tests/test_import.py
   version:
-    name: parse version from tag
     runs-on: ubuntu-latest
+    name: parse version from tag
     outputs:
       version: ${{ steps.version.outputs.version }}
     steps:
@@ -77,14 +76,14 @@ jobs:
         with:
           args: --pattern "(?P<base>\d+\.\d+\.\d+)"
   export:
-    name: export (py${{ matrix.python-version }}, ${{ matrix.runs-on }})
     needs: [ build, version, date ]
-    runs-on: ${{ matrix.runs-on }}
     strategy:
       fail-fast: false
       matrix:
         runs-on: [ ubuntu-latest, macos-latest ]
         python-version: [ '3.9', '3.10', '3.11' ]
+    runs-on: ${{ matrix.runs-on }}
+    name: export (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})
     steps:
       - uses: actions/checkout@v4
       - uses: mamba-org/setup-micromamba@v1

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -16,9 +16,7 @@ jobs:
   build:
     uses: ./.github/workflows/build.yaml
   unit_tests:
-    name: ${{ matrix.package }} (py${{ matrix.python-version }}, ${{ matrix.runs-on }})
     needs: [ build ]
-    runs-on: ${{ matrix.runs-on }}
     strategy:
       fail-fast: false
       matrix:
@@ -31,9 +29,11 @@ jobs:
           - package: wfpc2tools
         exclude:
           - runs-on: macos-latest
-            python-version: 3.9
+            python-version: '3.9'
           - runs-on: macos-latest
-            python-version: 3.10
+            python-version: '3.10'
+    runs-on: ${{ matrix.runs-on }}
+    name: ${{ matrix.package }} (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})
     steps:
       - uses: actions/checkout@v4
       - uses: mamba-org/setup-micromamba@v1
@@ -66,11 +66,8 @@ jobs:
         env:
           CRDS_SERVER_URL: ${{ matrix.env.CRDS_SERVER_URL }}
   unit_tests_from_source:
-    name: ${{ matrix.package }} (py${{ matrix.python-version }}, ${{ matrix.runs-on }})
     needs: [ build ]
-    runs-on: ${{ matrix.runs-on }}
     strategy:
-      fail-fast: false
       matrix:
         package: [ hstcal ]
         runs-on: [ ubuntu-latest, macos-latest ]
@@ -98,9 +95,12 @@ jobs:
           #   extras: [ test ]
         exclude:
           - runs-on: macos-latest
-            python-version: 3.9
+            python-version: '3.9'
           - runs-on: macos-latest
-            python-version: 3.10
+            python-version: '3.10'
+      fail-fast: false
+    runs-on: ${{ matrix.runs-on }}
+    name: ${{ matrix.package }} (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})
     steps:
       - uses: actions/checkout@v4
         with:
@@ -148,15 +148,12 @@ jobs:
           CRDS_SERVER_URL: ${{ matrix.env.CRDS_SERVER_URL }}
         working-directory: ${{ matrix.package }}
   unit_tests_via_tox:
-    name: ${{ matrix.package }} (${{ matrix.python-factor }}${{ matrix.default_factors != '' || '-' }}${{ matrix.default_factors }}${{ matrix.args != '' || ' -- ' }}${{ matrix.args }}, ${{ matrix.runs-on }})
     needs: [ build ]
-    runs-on: ${{ matrix.runs-on }}
     strategy:
-      fail-fast: false
       matrix:
         package: [ acstools, asdf, calcos, ccdproc, costools, synphot, jwst ]
         runs-on: [ ubuntu-latest, macos-latest ]
-        python-factor: [ 'py39', 'py310', 'py311' ]
+        python-factor: [ py39, py310, py311 ]
         include:
           - package: acstools
             repository: spacetelescope/acstools
@@ -187,6 +184,9 @@ jobs:
             python-factor: py39
           - runs-on: macos-latest
             python-factor: py310
+      fail-fast: false
+    runs-on: ${{ matrix.runs-on }}
+    name: ${{ matrix.package }} (tox ${{ matrix.python-factor }}, ${{ matrix.runs-on }})
     steps:
       - uses: actions/checkout@v4
         with:
@@ -227,11 +227,8 @@ jobs:
       - run: tox -e ${{ matrix.python-factor }}${{ matrix.default_factors != '' || '-' }}${{ matrix.default_factors }}${{ matrix.args != '' || ' -- ' }}${{ matrix.args }}
         working-directory: ${{ matrix.package }}
   smoke_tests:
-    name: ${{ matrix.package }} (py${{ matrix.python-version }}, ${{ matrix.runs-on }})
     needs: [ build ]
-    runs-on: ${{ matrix.runs-on }}
     strategy:
-      fail-fast: false
       matrix:
         package: [ calcos, drizzlepac ]
         runs-on: [ ubuntu-latest, macos-latest ]
@@ -252,6 +249,9 @@ jobs:
             python-version: 3.9
           - runs-on: macos-latest
             python-version: 3.10
+      fail-fast: false
+    runs-on: ${{ matrix.runs-on }}
+    name: ${{ matrix.package }} (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})
     steps:
       - uses: actions/checkout@v4
         with: