From 49f8c89b16572ae0b84c9637aa56be715ab841c1 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 15 May 2024 14:31:13 -0400 Subject: [PATCH] Tox devdeps_npy2 (#271) * Support devdeps (numpy 1.x) and devdeps_npy2 (numpy 2.x) * Add devdeps_npy2 target to matrix --- .github/workflows/spherical_geometry.yml | 4 ++++ tox.ini | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/spherical_geometry.yml b/.github/workflows/spherical_geometry.yml index c966f80..e179d7c 100644 --- a/.github/workflows/spherical_geometry.yml +++ b/.github/workflows/spherical_geometry.yml @@ -53,3 +53,7 @@ jobs: - name: Python 3.12 with dev version of dependencies linux: py312-test-devdeps posargs: -v + + - name: Python 3.12 with dev version of dependencies (numpy 2.x) + linux: py312-test-devdeps-numpy2x + posargs: -v diff --git a/tox.ini b/tox.ini index 535fc80..2b50ad5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{39,310,311,312}-test{,-devdeps}{,-cov} + py{39,310,311,312}-test{,-devdeps,-numpy2x}{,-cov} codestyle twine bandit @@ -10,7 +10,7 @@ envlist = passenv = HOME,WINDIR,CC,CI setenv = - devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple https://pypi.anaconda.org/liberfa/simple + devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple # Run the tests in a temporary directory to make sure that we don't import # package from the source tree @@ -32,10 +32,9 @@ description = deps = # The devdeps factor is intended to be used to install the latest # developer version or nightly wheel of key dependencies. - devdeps: pyerfa>=0.0.dev0 - devdeps: numpy>=0.0.dev0 devdeps: astropy>=0.0.dev0 - + !numpy2x: numpy==1.* + numpy2x: numpy>=2.0.0.dev0 cov: pytest-cov extras =