job names

zacharyburnett · Aug 2, 2024 · af74fad · af74fad
1 parent 4340fb9
commit af74fad
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -47,7 +47,7 @@ jobs:
             extras: [ test ]
           - package: jwst
             extras: [ test ]
-            observatory: jwst
+            crds-observatory: jwst
           #- package: pysynphot
           #  extras: [ test ]
           - package: reftools
@@ -65,13 +65,13 @@ jobs:
           - runs-on: macos-latest
             python-version: '3.11'
     runs-on: ${{ matrix.runs-on }}
-    name: "`${{ matrix.package }}` (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})"
+    name: "[${{ matrix.runs-on }}, py${{ matrix.python-version }}] `pytest --pyargs ${{ matrix.package }} -n auto ${{ matrix.pytest-args }}`"
     steps:
-      - if: matrix.crds_observatory != ''
+      - if: matrix.crds-observatory != ''
         run: |
-          echo CRDS_OBSERVATORY=${{ matrix.crds_observatory }} >> $GITHUB_ENV
-          echo CRDS_SERVER_URL=${{ matrix.crds_observatory }}-crds.stsci.edu >> $GITHUB_ENV
-          echo CRDS_CONTEXT=${{ matrix.crds_observatory == 'hst' && needs.crds_contexts.outputs.hst || matrix.crds_observatory == 'jwst' && needs.crds_contexts.outputs.jwst || matrix.crds_observatory == 'roman' && needs.crds_contexts.outputs.roman || '' }} >> $GITHUB_ENV
+          echo CRDS_OBSERVATORY=${{ matrix.crds-observatory }} >> $GITHUB_ENV
+          echo CRDS_SERVER_URL=${{ matrix.crds-observatory }}-crds.stsci.edu >> $GITHUB_ENV
+          echo CRDS_CONTEXT=${{ matrix.crds-observatory == 'hst' && needs.crds_contexts.outputs.hst || matrix.crds-observatory == 'jwst' && needs.crds_contexts.outputs.jwst || matrix.crds-observatory == 'roman' && needs.crds_contexts.outputs.roman || '' }} >> $GITHUB_ENV
         shell: bash
       - if: env.CRDS_CONTEXT != ''
         uses: actions/cache@v4
@@ -95,7 +95,7 @@ jobs:
         run: pip install "${{ matrix.package }}[${{ join(matrix.extras, ',') }}]"
       - run: pip install pytest-xdist
       - run: pip list
-      - run: pytest -n auto ${{ matrix.pytest-args }} --pyargs ${{ matrix.package }} 
+      - run: pytest --pyargs ${{ matrix.package }} ${{ matrix.pytest-args }} -n auto 
   test_from_source:
     needs: [ build, crds_contexts ]
     strategy:
@@ -116,8 +116,8 @@ jobs:
             repository: spacetelescope/hstcal
             test-dependencies: crds ci_watson
             pytest-args: --slow
-            test_directory: tests
-            crds_observatory: hst
+            test-directory: tests
+            crds-observatory: hst
           #- package: stistools
           #  repository: spacetelescope/stistools
           # - package: stsynphot
@@ -134,13 +134,13 @@ jobs:
             python-version: '3.11'
       fail-fast: false
     runs-on: ${{ matrix.runs-on }}
-    name: "`${{ matrix.package }}` (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})"
+    name: "[${{ matrix.runs-on }}, py${{ matrix.python-version }}] `pytest ${{ matrix.package }}/${{ matrix.test-directory }} ${{ matrix.pytest-args }} -n auto`"
     steps:
-      - if: matrix.crds_observatory != ''
+      - if: matrix.crds-observatory != ''
         run: |
-          echo CRDS_OBSERVATORY=${{ matrix.crds_observatory }} >> $GITHUB_ENV
-          echo CRDS_SERVER_URL=${{ matrix.crds_observatory }}-crds.stsci.edu >> $GITHUB_ENV
-          echo CRDS_CONTEXT=${{ matrix.crds_observatory == 'hst' && needs.crds_contexts.outputs.hst || matrix.crds_observatory == 'jwst' && needs.crds_contexts.outputs.jwst || matrix.crds_observatory == 'roman' && needs.crds_contexts.outputs.roman || '' }} >> $GITHUB_ENV
+          echo CRDS_OBSERVATORY=${{ matrix.crds-observatory }} >> $GITHUB_ENV
+          echo CRDS_SERVER_URL=${{ matrix.crds-observatory }}-crds.stsci.edu >> $GITHUB_ENV
+          echo CRDS_CONTEXT=${{ matrix.crds-observatory == 'hst' && needs.crds_contexts.outputs.hst || matrix.crds-observatory == 'jwst' && needs.crds_contexts.outputs.jwst || matrix.crds-observatory == 'roman' && needs.crds_contexts.outputs.roman || '' }} >> $GITHUB_ENV
         shell: bash
       - if: env.CRDS_CONTEXT != ''
         uses: actions/cache@v4
@@ -180,7 +180,7 @@ jobs:
       - if: matrix.pre_command != ''
         run: ${{ matrix.pre_command }}
         working-directory: ${{ matrix.package }}
-      - run: pytest -n auto ${{ matrix.pytest-args }} ${{ matrix.test_directory }}
+      - run: pytest ${{ matrix.test-directory }} ${{ matrix.pytest-args }} -n auto
         working-directory: ${{ matrix.package }}
   crds_contexts:
     uses: spacetelescope/crds/.github/workflows/contexts.yml@master
@@ -208,7 +208,7 @@ jobs:
           - runs-on: macos-latest
             python-version: '3.11'
     runs-on: ${{ matrix.runs-on }}
-    name: "`${{ matrix.package }}` (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})"
+    name: "[${{ matrix.runs-on }}, py${{ matrix.python-version }}] `./runtests`"
     env:
       CRDS_PATH: /tmp/crds-cache-default-test
       CRDS_TEST_ROOT: /tmp
@@ -250,7 +250,7 @@ jobs:
             ${{ needs.crds_test_cache.outputs.path }}
             ${{ needs.crds_test_cache.outputs.testing_cache }}
           key: ${{ needs.crds_test_cache.outputs.key }}
-      - run: ./runtests --cover
+      - run: ./runtests
         working-directory: ${{ matrix.package }}
   test_smoke:
     needs: [ build ]
@@ -263,11 +263,11 @@ jobs:
         include:
           - package: calcos
             run: calcos la8n01qkq_rawtag_a.fits
-            crds_observatory: hst
+            crds-observatory: hst
             jref: hst/references/hst
           - package: drizzlepac
             run: pytest -n auto tests/test_drizzlepac.py
-            crds_observatory: hst
+            crds-observatory: hst
             jref: hst/references/hst
         exclude:
           - runs-on: macos-13
@@ -280,15 +280,15 @@ jobs:
             python-version: '3.11'
       fail-fast: false
     runs-on: ${{ matrix.runs-on }}
-    name: "smoke test `${{ matrix.package }}` (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})"
+    name: "[${{ matrix.runs-on }}, py${{ matrix.python-version }}] `${{ matrix.run }}`"
     env:
       jref: /tmp/crds_cache/${{ matrix.jref }}
     steps:
-      - if: matrix.crds_observatory != ''
+      - if: matrix.crds-observatory != ''
         run: |
-          echo CRDS_OBSERVATORY=${{ matrix.crds_observatory }} >> $GITHUB_ENV
-          echo CRDS_SERVER_URL=${{ matrix.crds_observatory }}-crds.stsci.edu >> $GITHUB_ENV
-          echo CRDS_CONTEXT=${{ matrix.crds_observatory == 'hst' && needs.crds_contexts.outputs.hst || matrix.crds_observatory == 'jwst' && needs.crds_contexts.outputs.jwst || matrix.crds_observatory == 'roman' && needs.crds_contexts.outputs.roman || '' }} >> $GITHUB_ENV
+          echo CRDS_OBSERVATORY=${{ matrix.crds-observatory }} >> $GITHUB_ENV
+          echo CRDS_SERVER_URL=${{ matrix.crds-observatory }}-crds.stsci.edu >> $GITHUB_ENV
+          echo CRDS_CONTEXT=${{ matrix.crds-observatory == 'hst' && needs.crds_contexts.outputs.hst || matrix.crds-observatory == 'jwst' && needs.crds_contexts.outputs.jwst || matrix.crds-observatory == 'roman' && needs.crds_contexts.outputs.roman || '' }} >> $GITHUB_ENV
         shell: bash
       - if: env.CRDS_CONTEXT != ''
         uses: actions/cache@v4