diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 40314fe..f43d2b8 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -20,22 +20,22 @@ jobs: matrix: include: - os: ubuntu-latest - python: '3.10' - tox_env: 'py310-test-alldeps' - prefix: 'py310-test-alldeps' + python: '3.12' + tox_env: 'py312-test-alldeps' + prefix: 'py312-test-alldeps' - os: ubuntu-latest - python: '3.10' - tox_env: 'py310-test-astropy53' - prefix: 'py310-test-astropy53' + python: '3.12' + tox_env: 'py312-test-astropy61' + prefix: 'py312-test-astropy61' - os: ubuntu-latest - python: '3.10' - tox_env: 'py310-test-numpy122' - prefix: 'py310-test-numpy122' + python: '3.12' + tox_env: 'py312-test-numpy2' + prefix: 'py312-test-numpy2' - os: ubuntu-latest - python: '3.10' + python: '3.12' tox_env: 'build_docs' prefix: 'build_docs' @@ -51,7 +51,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install tox + python -m pip install tox setuptools + python -m pip install --upgrade setuptools - name: Test with Tox run: | export PY_COLORS=1 diff --git a/CHANGES.md b/CHANGES.md index aaa1884..9630fb9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,7 +11,7 @@ - Update rtd to use `ubuntu-22.04`. #200 - `update_default_config` removed since `astropy` no longer needs it. #205 -- Update rtd to Use Python 3.11.8. #206 +- Update rtd to Use `Python 3.11.8`. #206 - Update installation requiements for use with `python 3.12`. #209 - Remove `astropy_helpers` from requirements. #209 diff --git a/pyproject.toml b/pyproject.toml index 7e7daea..7729065 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] -requires = ["setuptools", +requires = ["setuptools>=72", "setuptools_scm", "wheel"] diff --git a/tox.ini b/tox.ini index e78d28f..e320abd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,13 @@ [tox] envlist = py{312}-test{-alldeps} - py{312}-test-numpy{122} + py{312}-test-numpy{2} py{312}-test-astropy{61} build_docs linkcheck requires = - setuptools >= 72.2.0 + setuptools >= 72 pip >= 24.0.0 isolated_build = true @@ -38,7 +38,6 @@ changedir = .tmp/{envname} description = run tests alldeps: with all optional dependencies - numpy122: with numpy 1.22.* numpy2: with numpy 2.0.* astropy61: with astropy 6.1.* astropylts: with the latest astropy LTS @@ -47,7 +46,6 @@ description = deps = -r{toxinidir}/requirements.txt numpy2: numpy==2.0.* - numpy122: numpy==1.22.* astropy61: astropy==6.1.* # The following indicates which extras_require from setup.cfg will be installed