From 0f3ef4cb428bc3f690c2783254a25f40155e66de Mon Sep 17 00:00:00 2001
From: zacharyburnett <zburnett@stsci.edu>
Date: Mon, 21 Aug 2023 13:07:11 -0400
Subject: [PATCH] separate first and third party dev dependencies into
 requirements.txt files

---
 .github/workflows/roman_ci.yml  | 2 +-
 JenkinsfileRT                   | 8 ++++++--
 JenkinsfileRT_dev               | 7 +++++--
 requirements-dev-thirdparty.txt | 8 ++++++++
 requirements-dev.txt            | 7 -------
 tox.ini                         | 5 ++---
 6 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 requirements-dev-thirdparty.txt

diff --git a/.github/workflows/roman_ci.yml b/.github/workflows/roman_ci.yml
index ff787c608..09166c725 100644
--- a/.github/workflows/roman_ci.yml
+++ b/.github/workflows/roman_ci.yml
@@ -51,7 +51,7 @@ jobs:
         - linux: check-dependencies
         - linux: build-dist
   test:
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     needs: [ crds ]
     with:
       setenv: |
diff --git a/JenkinsfileRT b/JenkinsfileRT
index 993c3d18a..7f0dbf594 100644
--- a/JenkinsfileRT
+++ b/JenkinsfileRT
@@ -93,7 +93,8 @@ bc0.build_cmds = bc0.build_cmds + [
     "pip list"
 ]
 bc0.test_cmds = [
-    "pytest --cov-report=xml:coverage.xml --cov=./ -r sxf -n auto --bigdata --slow \
+    "pytest -r sxf -n auto --bigdata --slow \
+    --cov --cov-report=xml:coverage.xml \
     --ddtrace \
     --basetemp=${pytest_basetemp} --junit-xml=results.xml --dist=loadscope \
     --env=${artifactoryenv} ${pytest_args}",
@@ -115,5 +116,8 @@ bc1.build_cmds = bc1.build_cmds + PipInject(env.OVERRIDE_REQUIREMENTS)
 bc1.test_cmds = []
 bc1.test_configs = []
 
-utils.run([jobconfig, bc0, bc1])
+bc2 = utils.copy(bc0)
+bc2.pip_reqs_files = ['requirements-sdp.txt', 'requirements-dev.txt']
+
+utils.run([jobconfig, bc0, bc1, bc2])
 }  // withCredentials
diff --git a/JenkinsfileRT_dev b/JenkinsfileRT_dev
index 1223c5462..09259856f 100644
--- a/JenkinsfileRT_dev
+++ b/JenkinsfileRT_dev
@@ -80,7 +80,7 @@ bc0.conda_packages = [
     "python=${python_version}",
     "freetds",
 ]
-bc0.pip_reqs_files = ['requirements-dev.txt']
+bc0.pip_reqs_files = ['requirements-dev-thirdparty.txt']
 bc0.build_cmds = [
     "pip install -e .[test]",
     "pip install pytest-xdist pytest-sugar",
@@ -109,5 +109,8 @@ bc1.build_cmds = bc1.build_cmds + PipInject(env.OVERRIDE_REQUIREMENTS)
 bc1.test_cmds = []
 bc1.test_configs = []
 
-utils.run([jobconfig, bc0, bc1])
+bc2 = utils.copy(bc0)
+bc2.pip_reqs_files = ['requirements-dev-thirdparty.txt', 'requirements-dev.txt']
+
+utils.run([jobconfig, bc0, bc1, bc2])
 }  // withCredentials
diff --git a/requirements-dev-thirdparty.txt b/requirements-dev-thirdparty.txt
new file mode 100644
index 000000000..636b4f5ce
--- /dev/null
+++ b/requirements-dev-thirdparty.txt
@@ -0,0 +1,8 @@
+git+https://github.com/asdf-format/asdf
+git+https://github.com/asdf-format/asdf-transform-schemas
+git+https://github.com/asdf-format/asdf-wcs-schemas
+--extra-index-url https://pypi.anaconda.org/astropy/simple astropy --pre
+git+https://github.com/astropy/asdf-astropy
+--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
+numpy>=0.0.dev0
+scipy>=0.0.dev0
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 5ea10a2ea..265acd77e 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,14 +1,7 @@
-git+https://github.com/asdf-format/asdf
-git+https://github.com/asdf-format/asdf-transform-schemas
-git+https://github.com/asdf-format/asdf-wcs-schemas
---extra-index-url https://pypi.anaconda.org/astropy/simple astropy --pre
-git+https://github.com/astropy/asdf-astropy
 git+https://github.com/spacetelescope/crds
 git+https://github.com/spacetelescope/gwcs
-numpy>=0.0.dev0
 git+https://github.com/spacetelescope/roman_datamodels
 git+https://github.com/spacetelescope/rad
-scipy>=0.0.dev0
 git+https://github.com/spacetelescope/stpipe
 git+https://github.com/spacetelescope/stcal
 git+https://github.com/spacetelescope/tweakwcs
diff --git a/tox.ini b/tox.ini
index 7dd5711e9..fed8332e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,8 +53,6 @@ pass_env =
     TEST_BIGDATA
     CODECOV_*
     DD_*
-set_env =
-    devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/scientific-python-nightly-wheels/simpl
 
 extras =
     test
@@ -66,7 +64,8 @@ deps =
 commands_pre =
     oldestdeps: minimum_dependencies romancal --filename requirements-min.txt
     oldestdeps: pip install -r requirements-min.txt
-    devdeps: pip install -r requirements-dev.txt -U --upgrade-strategy eager
+    devdeps: pip install -r requirements-dev.txt
+    devdeps: pip install -r requirements-dev-thirdparty.txt
     sdpdeps: pip install -r requirements-sdp.txt
     pip freeze
 commands =