From 960aa399c91f9754dae222f01d92d77d7b7cf90f Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 8 Oct 2024 08:35:58 -0400 Subject: [PATCH 1/4] allow python 3.13 --- .github/workflows/ci.yml | 7 +++---- pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c46a1f25f..03110ab8ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,11 +72,10 @@ jobs: - linux: py310-oldestdeps-xdist-cov pytest-results-summary: true - linux: py310-xdist - - linux: py311-xdist - pytest-results-summary: true - - macos: py311-xdist - pytest-results-summary: true - linux: py311-xdist-cov coverage: codecov pytest-results-summary: true - linux: py312-xdist + - linux: py313-xdist + - macos: py311-xdist + pytest-results-summary: true diff --git a/pyproject.toml b/pyproject.toml index 95036c6bc3..c82d46f57b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "jwst" description = "Library for calibration of science observations from the James Webb Space Telescope" -requires-python = ">=3.10,<3.13" +requires-python = ">=3.10" authors = [ { name = "JWST calibration pipeline developers" }, ] From 7c1ce2f03f7f03df8e365891b92345796e2366b2 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Fri, 3 Jan 2025 13:08:49 -0500 Subject: [PATCH 2/4] Remove 3.10 support --- .github/workflows/ci.yml | 9 ++++----- .github/workflows/ci_cron.yml | 6 +++--- .github/workflows/tests_devdeps.yml | 8 ++++---- pyproject.toml | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03110ab8ea..13e57f683d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,13 +69,12 @@ jobs: cache-path: /tmp/data/crds_cache cache-key: crds-${{ needs.crds_context.outputs.context }} envs: | - - linux: py310-oldestdeps-xdist-cov + - linux: py311-oldestdeps-xdist-cov pytest-results-summary: true - - linux: py310-xdist - - linux: py311-xdist-cov + - linux: py311-xdist + - linux: py312-xdist-cov coverage: codecov pytest-results-summary: true - - linux: py312-xdist - linux: py313-xdist - - macos: py311-xdist + - macos: py312-xdist pytest-results-summary: true diff --git a/.github/workflows/ci_cron.yml b/.github/workflows/ci_cron.yml index c0db35ced5..67954fe788 100644 --- a/.github/workflows/ci_cron.yml +++ b/.github/workflows/ci_cron.yml @@ -46,8 +46,8 @@ jobs: cache-path: /tmp/crds_cache cache-key: crds-${{ needs.crds_context.outputs.context }} envs: | - - macos: py310-xdist - - macos: py312-xdist - - linux: py311-pyargs-xdist + - macos: py311-xdist + - macos: py313-xdist + - linux: py312-pyargs-xdist - linux: py3-pyargs-xdist diff --git a/.github/workflows/tests_devdeps.yml b/.github/workflows/tests_devdeps.yml index dda0e41f77..8a27ac3fed 100644 --- a/.github/workflows/tests_devdeps.yml +++ b/.github/workflows/tests_devdeps.yml @@ -59,17 +59,17 @@ jobs: pytest-results-summary: true - macos: py3-xdist pytest-results-summary: true - - linux: py311-stdevdeps-xdist + - linux: py312-stdevdeps-xdist pytest-results-summary: true - - macos: py311-stdevdeps-xdist + - macos: py312-stdevdeps-xdist pytest-results-summary: true - linux: py3-stdevdeps-xdist pytest-results-summary: true - macos: py3-stdevdeps-xdist pytest-results-summary: true - - linux: py311-devdeps-xdist + - linux: py312-devdeps-xdist pytest-results-summary: true - - macos: py311-devdeps-xdist + - macos: py312-devdeps-xdist pytest-results-summary: true - linux: py3-devdeps-xdist pytest-results-summary: true diff --git a/pyproject.toml b/pyproject.toml index c82d46f57b..5a99681eac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "jwst" description = "Library for calibration of science observations from the James Webb Space Telescope" -requires-python = ">=3.10" +requires-python = ">=3.11" authors = [ { name = "JWST calibration pipeline developers" }, ] @@ -13,9 +13,9 @@ classifiers = [ "Operating System :: POSIX", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", ] dependencies = [ "asdf>=3.3,<5", From 8f349a48147f65eee1f2c7044ce76e745baf6516 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Fri, 3 Jan 2025 13:09:44 -0500 Subject: [PATCH 3/4] Add changelog --- changes/8864.general.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/8864.general.rst diff --git a/changes/8864.general.rst b/changes/8864.general.rst new file mode 100644 index 0000000000..fb01ffa2e7 --- /dev/null +++ b/changes/8864.general.rst @@ -0,0 +1 @@ +Drop support for Python 3.10 and add support for Python 3.13. From e95c7430eeeef0d6e91792fd3da0be5cc4613df8 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Fri, 3 Jan 2025 13:22:48 -0500 Subject: [PATCH 4/4] Use stcal dev Only stcal dev supports 3.13 --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5a99681eac..00e4d1124e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,8 @@ dependencies = [ "scikit-image>=0.20.0", "scipy>=1.14.1", "spherical-geometry>=1.2.22", - "stcal>=1.11.0,<1.12.0", + # "stcal>=1.11.0,<1.12.0", + "stcal @ git+https://github.com/spacetelescope/stcal.git@main", "stdatamodels>=2.2.0,<2.3.0", "stpipe>=0.8.0,<0.9.0", "stsci.imagestats>=1.6.3",