Merge branch 'spacetelescope:master' into interp2d_fix

Author: dvstark

tox.ini

@@ -40,6 +40,7 @@ deps =
     devdeps: scikit-image>=0.0.dev0
     devdeps: pyerfa>=0.0.dev0
     devdeps: astropy>=0.0.dev0
+    devdeps: photutils>=0.0.dev0
     devdeps: git+https://github.com/spacetelescope/ci_watson.git
     devdeps: stsci.tools
 
@@ -49,10 +50,6 @@ extras =
     predeps: all
 
 commands =
-    # Force numpy-dev after matplotlib downgrades it (https://github.com/matplotlib/matplotlib/issues/26847)
-    devdeps: python -m pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
-    # photutils has C-extension and must be built with numpy-dev in devdeps
-    devdeps: python -m pip install --pre --upgrade git+https://github.com/astropy/photutils.git
     pip freeze
     pytest --pyargs acstools {toxinidir}/doc {posargs}