From 30de230458c5e26b068372ae6d0889ac546c17bb Mon Sep 17 00:00:00 2001
From: William Jamieson <wjamieson@stsci.edu>
Date: Mon, 30 Oct 2023 16:04:19 -0400
Subject: [PATCH] Revert #123 (#125)

Co-authored-by: Zach Burnett <zachary.r.burnett@gmail.com>
---
 .github/workflows/ci.yml   | 12 ++----
 .github/workflows/data.yml | 77 --------------------------------------
 tox.ini                    |  1 -
 3 files changed, 3 insertions(+), 87 deletions(-)
 delete mode 100644 .github/workflows/data.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c6144fa1..e5613384 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,19 +27,13 @@ jobs:
         - macos: py311-xdist
         - linux: py311-cov-xdist
           coverage: 'codecov'
-  data:
-    uses: ./.github/workflows/data.yml
   test_downstream:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
-    needs: [ data ]
     with:
       setenv: |
-        WEBBPSF_PATH: ${{ needs.data.outputs.webbpsf_path }}
-        CRDS_PATH: ${{ needs.data.outputs.path }}/crds_cache
+        CRDS_PATH: /tmp/data/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 }}
       envs: |
-        - linux: test-jwst-xdist
-        - linux: test-romancal-xdist
+        - linux: py311-jwst-xdist
+        - linux: py311-romancal-xdist
diff --git a/.github/workflows/data.yml b/.github/workflows/data.yml
deleted file mode 100644
index 7f0306a6..00000000
--- a/.github/workflows/data.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-on:
-  workflow_call:
-    outputs:
-      path:
-        value: ${{ jobs.path.outputs.path }}
-      webbpsf_path:
-        value: ${{ jobs.webbpsf_path.outputs.path }}
-      webbpsf_hash:
-        value: ${{ jobs.webbpsf_data.outputs.hash }}
-  workflow_dispatch:
-  schedule:
-    - cron: "42 4 * * 3"
-
-env:
-  DATA_PATH: /tmp/data
-
-jobs:
-  path:
-    runs-on: ubuntu-latest
-    outputs:
-      path: ${{ steps.path.outputs.path }}
-    steps:
-      - id: path
-        run: echo "path=${{ env.DATA_PATH }}" >> $GITHUB_OUTPUT
-  webbpsf_path:
-    needs: [ path ]
-    runs-on: ubuntu-latest
-    outputs:
-      path: ${{ steps.path.outputs.path }}
-    steps:
-      - id: path
-        run: echo "path=${{ env.DATA_PATH }}/webbpsf-data" >> $GITHUB_OUTPUT
-  webbpsf_data:
-    if: (github.repository == 'spacetelescope/stpipe' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'update webbpsf data')))
-    needs: [ webbpsf_path ]
-    name: download and cache WebbPSF data
-    runs-on: ubuntu-latest
-    env:
-      WEBBPSF_DATA_URL: https://stsci.box.com/shared/static/qxpiaxsjwo15ml6m4pkhtk36c9jgj70k.gz
-    steps:
-      - run: mkdir -p tmp/data
-      - run: wget ${{ env.WEBBPSF_DATA_URL }} -O tmp/webbpsf-data.tar.gz
-      - id: data_hash
-        run: echo "hash=$( shasum tmp/webbpsf-data.tar.gz | cut -d ' ' -f 1 )" >> $GITHUB_OUTPUT
-      - id: cache_check
-        uses: actions/cache@v3
-        with:
-          path: ${{ needs.webbpsf_path.outputs.path }}
-          key: webbpsf-${{ steps.data_hash.outputs.hash }}
-      - if: ${{ steps.cache_check.outputs.cache-hit != 'true' }}
-        run: mkdir -p ${{ env.DATA_PATH }}
-      - if: ${{ steps.cache_check.outputs.cache-hit != 'true' }}
-        run: tar -xzvf tmp/webbpsf-data.tar.gz -C ${{ env.DATA_PATH }}
-  webbpsf_hash:
-    needs: [ webbpsf_path, webbpsf_data ]
-    # run data job if webbpsf-data succeeds or is skipped. This allows
-    # this data job to always fetch the crds context even if the webbpsf data fetching
-    # was skipped (and an existing cache will be used for the webbpsf data).
-    if: always() && (needs.webbpsf_data.result == 'success' || needs.webbpsf_data.result == 'skipped')
-    name: retrieve latest data cache key
-    runs-on: ubuntu-latest
-    env:
-      GH_TOKEN: ${{ github.token }}
-    outputs:
-      hash: ${{ steps.hash.outputs.hash }}
-    steps:
-      - id: hash
-        run: |
-          # use actions/gh-actions-cache to allow filtering by key
-          gh extension install actions/gh-actions-cache
-
-          RECENT=$(gh actions-cache list -R spacetelescope/stpipe --key webbpsf- --sort created-at | cut -f 1 | head -n 1)
-          echo "RECENT=$RECENT"
-          HASH=$(echo $RECENT | cut -d '-' -f 2)
-          echo "HASH=$HASH"
-          echo "hash=$HASH" >> $GITHUB_OUTPUT
-          if [ "$HASH" == '' ]; then exit 1; fi
diff --git a/tox.ini b/tox.ini
index 28612957..edfac95a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,7 +54,6 @@ deps =
 pass_env =
     CRDS_*
     CI
-    WEBBPSF_PATH
 set_env =
     devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
     jwst: CRDS_SERVER_URL=https://jwst-crds.stsci.edu