combine requirements-dev-st.txt and requirements-dev-thirdparty.txt into requirements-dev.txt

Author: zacharyburnett

.github/workflows/tests_extra.yml

@@ -64,11 +64,6 @@ jobs:
         - macos: py311
         - macos: py312
         - macos: py313
-        # TODO: merge stdevdeps into devdeps
-        - linux: py313-stdevdeps
-          pytest-results-summary: true
-        - macos: py313-stdevdeps
-          pytest-results-summary: true
         - linux: py313-devdeps
           pytest-results-summary: true
         - macos: py313-devdeps

README.md

@@ -104,11 +104,10 @@ tools used for linting and reproducible environments run:
 
 This will install `tox` and the `pre-commit` tools in addition to all development dependencies.
 
-Development versions of dependencies are listed in `requirements-dev-st.txt` and `requirements-dev-thirdparty.txt`, containing STScI and third-party packages respectively.
+Development versions of dependencies are listed in `requirements-dev.txt`.
 To install these dependencies, run the following:
 
-    pip install -r requirements-dev-st.txt
-    pip install -r requirements-dev-thirdparty.txt
+    pip install -r requirements-dev.txt
 
 Need other useful packages in your development environment?
 

requirements-dev-st.txt

@@ -1,3 +1,16 @@
+# Roman upstream packages
+git+https://github.com/spacetelescope/roman_datamodels.git
+git+https://github.com/spacetelescope/rad.git
+
+# shared upstream packages
+git+https://github.com/spacetelescope/stcal.git
+git+https://github.com/spacetelescope/stpipe.git
+
+# Other important upstream packages
+git+https://github.com/spacetelescope/crds.git
+git+https://github.com/spacetelescope/gwcs.git
+git+https://github.com/spacetelescope/tweakwcs.git
+
 # ASDF upstream packages
 git+https://github.com/asdf-format/asdf-standard.git
 git+https://github.com/asdf-format/asdf.git
@@ -10,7 +23,6 @@ git+https://github.com/seperman/deepdiff.git@dev
 
 # Use weekly astropy dev build
 git+https://github.com/astropy/asdf-astropy.git
---extra-index-url https://pypi.anaconda.org/liberfa/simple pyerfa --pre
 --extra-index-url https://pypi.anaconda.org/astropy/simple
 astropy>=0.0.dev0
 photutils>=0.0.dev0

requirements-dev-thirdparty.txt requirements-dev.txtrequirements-dev-thirdparty.txt renamed to requirements-dev.txt

@@ -15,8 +15,7 @@ commands =
 description =
     run tests
     alldeps: with all optional dependencies
-    stdevdeps: with the latest developer version of key upstream spacetelescope dependencies
-    devdeps: with the latest developer version of key upstream third-party dependencies
+    devdeps: with the latest developer version of key upstream dependencies
     oldestdeps: with the oldest supported version of key dependencies
     pyargs: with --pyargs on installed package
     warnings: treating warnings as errors
@@ -39,11 +38,10 @@ deps =
     xdist: pytest-xdist
     ddtrace: ddtrace
     oldestdeps: minimum_dependencies
+    devdeps: -r requirements-dev.txt
 commands_pre =
     oldestdeps: minimum_dependencies romancal --filename requirements-min.txt
     oldestdeps: pip install -r requirements-min.txt
-    stdevdeps: pip install -r requirements-dev-st.txt -U --upgrade-strategy eager
-    devdeps: pip install -r requirements-dev-thirdparty.txt -U --upgrade-strategy eager
     pip list
 commands =
     pytest \