From 77167039a42cf3bc27036631c1ce75e6665a1247 Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Tue, 2 Jan 2024 12:28:39 -0500 Subject: [PATCH] Fix devdeps (#194) * Fix devdeps because photutils got installed after matplotlib downgraded numpy now. --- .github/workflows/ci_workflows.yml | 2 +- tox.ini | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 2510a70..2f780d3 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -59,6 +59,6 @@ jobs: linux: py39-test-alldeps posargs: --remote-data -v - - name: Python 3.12 with remote data + - name: Python 3.12 with remote data and dev dependencies linux: py312-test-devdeps posargs: --remote-data -v diff --git a/tox.ini b/tox.ini index a3e4dde..a4ba3b4 100644 --- a/tox.ini +++ b/tox.ini @@ -40,7 +40,6 @@ deps = devdeps: scikit-image>=0.0.dev0 devdeps: pyerfa>=0.0.dev0 devdeps: astropy>=0.0.dev0 - devdeps: git+https://github.com/astropy/photutils.git devdeps: git+https://github.com/spacetelescope/ci_watson.git devdeps: stsci.tools @@ -52,6 +51,8 @@ extras = 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}