From a80f85913a8068a61cddf21f32daff554e2458b4 Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 19 Aug 2024 10:12:31 -0400 Subject: [PATCH 1/4] allow python 3.13 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 868e5d1..e3bae4b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "drizzle" description = "A package for combining dithered images into a single image" -requires-python = ">=3.10,<3.13" +requires-python = ">=3.10" authors = [ { name = "STScI", email = "help@stsci.edu" }, ] From 1226256f2f8272a2224c53426add87edc972ce81 Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 20 Aug 2024 10:27:52 -0400 Subject: [PATCH 2/4] add python 3.13 to CI --- .github/workflows/ci.yml | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ddfd4c..160ebe4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,7 @@ jobs: - linux: py310-xdist - linux: py311-xdist + - linux: py313-xdist - macos: py312-xdist - windows: py312-xdist - linux: py312-xdist-cov diff --git a/tox.ini b/tox.ini index 6004f75..3ddc469 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] env_list = check-{style,security} - py{39,310,311,312}{,-xdist}{,-devdeps,-cov} + py{39,310,311,312,313}{,-xdist}{,-devdeps,-cov} # tox environments are constructed with so-called 'factors' (or terms) # separated by hyphens, e.g. test-devdeps-cov. Lines below starting with factor: From c594ed69902fcc8ae269e27cdc768b9be57a536e Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 20 Aug 2024 10:29:10 -0400 Subject: [PATCH 3/4] re-enable tox devdeps --- .github/workflows/ci.yml | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 160ebe4..75259e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,30 +31,4 @@ jobs: - linux: py312-xdist-cov coverage: codecov - #- linux: py312-xdist-devdeps - - # When py312-xdist-devdeps works again, we can remove this. - # When, you ask? Well, maybe after numpy 2.0 is released, maybe. - dev_deps_tests: - name: py312-devdeps - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.12' - - name: Install and build - run: | - python -m pip install --upgrade pip setuptools wheel - python -m pip install --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy>=0.0.dev0 --pre --upgrade - python -m pip install --extra-index-url https://pypi.anaconda.org/liberfa/simple pyerfa>=0.0.dev0 --pre --upgrade - python -m pip install --extra-index-url https://pypi.anaconda.org/astropy/simple astropy>=0.0.dev0 --pre --upgrade - python -m pip install --no-build-isolation -v -e .[test] - - name: Test with dev deps - run: | - pip freeze - pytest -v + - linux: py312-xdist-devdeps From a0f8481e915eddd74e2e0e4757888c819364bdd7 Mon Sep 17 00:00:00 2001 From: Brett Graham Date: Tue, 20 Aug 2024 14:36:27 -0400 Subject: [PATCH 4/4] Update tox.ini --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 3ddc469..f431bf5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] env_list = check-{style,security} - py{39,310,311,312,313}{,-xdist}{,-devdeps,-cov} + py{310,311,312,313}{,-xdist}{,-devdeps,-cov} # tox environments are constructed with so-called 'factors' (or terms) # separated by hyphens, e.g. test-devdeps-cov. Lines below starting with factor: