Revert "add data workflow to retrieve WebbPSF cache and rename toxenvs (

#223)"

This reverts commit 4a809eb.

.github/workflows/ci.yml

@@ -23,31 +23,63 @@ jobs:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       envs: |
+        - linux: check-style
         - linux: check-security
+        - linux: check-build
   test:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       envs: |
-        - linux: py39-oldestdeps-cov-xdist
-        - linux: py39-xdist
-        - linux: py310-xdist
-        - linux: py311-xdist
-        - macos: py311-xdist
-        - linux: py3-cov-xdist
+        - 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
           coverage: 'codecov'
   data:
-    uses: ./.github/workflows/data.yml
+    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 ]
     with:
       setenv: |
-        WEBBPSF_PATH: ${{ needs.data.outputs.webbpsf_path }}
-        CRDS_PATH: ${{ needs.data.outputs.path }}/crds_cache
+        CRDS_PATH: /tmp/crds_cache
         CRDS_CLIENT_RETRY_COUNT: 3
-        CRDS_CLIENT_RETRY_DELAY_SECONDS: 20
-      cache-path: ${{ needs.data.outputs.webbpsf_path }}
-      cache-key: webbpsf-${{ needs.data.outputs.webbpsf_hash }}
+        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: py311-jwst-cov-xdist
-        - linux: py311-romancal-cov-xdist
+        - linux: test-jwst-cov-xdist
+        - linux: test-romancal-cov-xdist

.github/workflows/ci_cron.yml

@@ -11,6 +11,8 @@ jobs:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       envs: |
-        - macos: py39-xdist
-        - macos: py310-xdist
-        - linux: py3-devdeps-xdist
+        - macos: test-xdist
+          python-version: 3.9
+        - macos: test-xdist
+          python-version: 3.10
+        - linux: test-devdeps-xdist