From cd488334585fd4702bf088f2e6eeb87da2159528 Mon Sep 17 00:00:00 2001 From: Richard R <58728519+rrjbca@users.noreply.github.com> Date: Fri, 31 Mar 2023 11:51:12 +0100 Subject: [PATCH] tox indexserver is deprecated; use PIP_INDEX_URL and PIP_EXTRA_INDEX_URL in dev environments (#597) --- tox.ini | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index c46759b5..6c12c746 100644 --- a/tox.ini +++ b/tox.ini @@ -11,8 +11,6 @@ requires = setuptools >= 30.3.0 pip >= 19.3.1 isolated_build = true -indexserver = - NIGHTLY = https://pypi.anaconda.org/scipy-wheels-nightly/simple [testenv] @@ -77,8 +75,8 @@ deps = astropy42: astropy==4.2.* astropy43: astropy==4.3.* - dev: :NIGHTLY:numpy - dev: :NIGHTLY:scipy + dev: numpy + dev: scipy dev: git+https://github.com/astropy/astropy.git#egg=astropy latest: astropy==4.3.* @@ -103,6 +101,13 @@ commands = !cov: pytest --pyargs skypy {toxinidir}/docs {posargs} cov: pytest --pyargs skypy {toxinidir}/docs --cov skypy --cov-config={toxinidir}/setup.cfg {posargs} +# For dev environment, use scipy-nightly-wheels as the default index server (for numpy and scipy) +# and PyPI as the extra index server (for all other dependencies, except astropy which is installed +# directly from GitHub). +setenv = + dev: PIP_INDEX_URL = https://pypi.anaconda.org/scipy-wheels-nightly/simple + dev: PIP_EXTRA_INDEX_URL = https://pypi.org/simple + [testenv:build_docs] changedir = docs description = invoke sphinx-build to build the HTML docs