Merge branch 'main' into acs-dependencies

spacetelescope · Aug 12, 2024 · 7d59988 · 7d59988
2 parents b77d1aa + 4d3f00d
commit 7d59988
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/ci_buildondemand_dev.yml b/.github/workflows/ci_buildondemand_dev.yml
@@ -0,0 +1,9 @@
+name: dev-Manual Execute All Notebooks
+on:
+  workflow_dispatch:
+
+jobs:
+  ExecuteNotebooks:
+   uses: spacetelescope/notebook-ci-actions/.github/workflows/ci_scheduled.yml@gough_test
+   with:
+      python-version: ${{ vars.PYTHON_VERSION }}
diff --git a/notebooks/ACS/acs_cte_forward_model/pre-requirements.sh b/notebooks/ACS/acs_cte_forward_model/pre-requirements.sh
@@ -1 +1,2 @@
-conda install --yes -c conda-forge hstcal
+pip install numpy
+conda create --yes -n hstcal -c conda-forge hstcal
diff --git a/notebooks/ACS/acs_reduction/pre-requirements.sh b/notebooks/ACS/acs_reduction/pre-requirements.sh
@@ -1 +1 @@
-conda install --yes -c conda-forge hstcal
+conda create --yes -n hstcal -c conda-forge hstcal
diff --git a/notebooks/ACS/acs_subarrays/pre-requirements.sh b/notebooks/ACS/acs_subarrays/pre-requirements.sh
@@ -1 +1 @@
-conda install --yes -c conda-forge hstcal
+conda create --yes -n hstcal -c conda-forge hstcal
diff --git a/notebooks/ACS/acs_subarrays/requirements.txt b/notebooks/ACS/acs_subarrays/requirements.txt
@@ -2,4 +2,4 @@ acstools>=3.5.0
 astropy>=5.3.3
 astroquery>=0.4.6
 stwcs>=1.7.2
-crds>=11.17.0
+crds>=11.17.0
diff --git a/notebooks/STIS/custom_ccd_darks/pre-requirements.sh b/notebooks/STIS/custom_ccd_darks/pre-requirements.sh
@@ -1 +1 @@
-conda install -y -c conda-forge hstcal==2.7.4
+conda create --yes -n hstcal -c conda-forge hstcal
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		conda install --yes -c conda-forge hstcal
		conda create --yes -n hstcal -c conda-forge hstcal
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		conda install -y -c conda-forge hstcal==2.7.4
		conda create --yes -n hstcal -c conda-forge hstcal