From 144547d1be1d862797102a31f1809ab5475edeaf Mon Sep 17 00:00:00 2001
From: William Jamieson <wjamieson@stsci.edu>
Date: Fri, 27 Oct 2023 13:48:34 -0400
Subject: [PATCH] cleanup old webbpsf stuff

---
 .github/workflows/ci.yml      | 51 ++++++-----------------------------
 .github/workflows/ci_cron.yml |  8 +++---
 2 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43cd65699..9882fe8b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,45 +30,13 @@ jobs:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       envs: |
-        - linux: test-oldestdeps-cov-xdist
-          python-version: 3.9
-        - linux: test-xdist
-          python-version: '3.9'
-        - linux: test-xdist
-          python-version: '3.10'
-        - linux: test-xdist
-          python-version: '3.11'
-        - macos: test-xdist
-          python-version: '3.11'
-        - linux: test-cov-xdist
+        - linux: py39-oldestdeps-cov-xdist
+        - linux: py39-xdist
+        - linux: py310-xdist
+        - linux: py311-xdist
+        - macos: py311-xdist
+        - linux: py3-cov-xdist
           coverage: 'codecov'
-  data:
-    name: retrieve data
-    runs-on: ubuntu-latest
-    outputs:
-      data_path: ${{ steps.data.outputs.path }}
-      data_hash: ${{ steps.data_hash.outputs.hash }}
-    steps:
-      # webbpsf:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - id: data
-        run: |
-          echo "path=/tmp/data" >> $GITHUB_OUTPUT
-          echo "webbpsf_url=https://stsci.box.com/shared/static/n1fealx9q0m6sdnass6wnyfikvxtc0zz.gz" >> $GITHUB_OUTPUT
-      - run: |
-          mkdir -p tmp/data/
-          mkdir -p ${{ steps.data.outputs.path }}
-      - run: wget ${{ steps.data.outputs.webbpsf_url }} -O tmp/minimal-webbpsf-data.tar.gz
-      - run: tar -xzvf tmp/minimal-webbpsf-data.tar.gz -C tmp/data/
-      - id: data_hash
-        run: echo "hash=${{ hashFiles( 'tmp/data' ) }}" >> $GITHUB_OUTPUT
-      - run: mv tmp/data/* ${{ steps.data.outputs.path }}
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.data.outputs.path }}
-          key: data-${{ steps.data_hash.outputs.hash }}
   test_downstream:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
     needs: [ data ]
@@ -77,9 +45,6 @@ jobs:
         CRDS_PATH: /tmp/crds_cache
         CRDS_CLIENT_RETRY_COUNT: 3
         CRDS_CLIENT_RETRY_DELAY_SECONDS: 20 
-        WEBBPSF_PATH: ${{ needs.data.outputs.data_path }}/webbpsf-data
-      cache-path: ${{ needs.data.outputs.data_path }}
-      cache-key: data-${{ needs.data.outputs.data_hash }}
       envs: |
-        - linux: test-jwst-cov-xdist
-        - linux: test-romancal-cov-xdist
+        - linux: py311-jwst-cov-xdist
+        - linux: py311-romancal-cov-xdist
diff --git a/.github/workflows/ci_cron.yml b/.github/workflows/ci_cron.yml
index 43ac55469..6289032a8 100644
--- a/.github/workflows/ci_cron.yml
+++ b/.github/workflows/ci_cron.yml
@@ -11,8 +11,6 @@ jobs:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       envs: |
-        - macos: test-xdist
-          python-version: 3.9
-        - macos: test-xdist
-          python-version: 3.10
-        - linux: test-devdeps-xdist
+        - macos: py39-xdist
+        - macos: py310-xdist
+        - linux: py3-devdeps-xdist