From c276ba3b9dd5f2cc79c3a5128a0ae9e791638757 Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 25 Nov 2024 09:44:01 -0500 Subject: [PATCH 1/4] switch stcal requirement to dev --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 009457079..5ded1dae5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,8 +26,8 @@ dependencies = [ # "roman_datamodels>=0.22.0,<0.23.0", "roman_datamodels @ git+https://github.com/spacetelescope/roman_datamodels.git", "scipy >=1.11", - "stcal>=1.10.0,<1.11.0", - # "stcal @ git+https://github.com/spacetelescope/stcal.git@main", + # "stcal>=1.10.0,<1.11.0", + "stcal @ git+https://github.com/spacetelescope/stcal.git@main", "stpipe >=0.7.0,<0.8.0", # "stpipe @ git+https://github.com/spacetelescope/stpipe.git@main", "tweakwcs >=0.8.8", From 4d10e58e7afc61ee45738417bcc22b28594572dd Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 25 Nov 2024 10:32:09 -0500 Subject: [PATCH 2/4] add setuptools requirement for python >= 3.12 --- pyproject.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 5ded1dae5..33834da0d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,6 +35,11 @@ dependencies = [ "stsci.imagestats >= 1.6.3", "drizzle >= 1.15.0", "webbpsf >= 1.2.1", + # pysiaf required by webbpsf uses pkg_resources which doesn't + # exist in python 3.12 without setuptools. This dependency + # can be dropped when webbpsf is dropped (or pysiaf is updated + # to not require pkg_resources). + "setuptools >= 60 ; python_version >= '3.12'", ] dynamic = [ "version", From 7e3ceb11f8aeb78110cc476d7c1863c4d0642d44 Mon Sep 17 00:00:00 2001 From: Brett Graham Date: Mon, 25 Nov 2024 11:06:25 -0500 Subject: [PATCH 3/4] Update pyproject.toml Co-authored-by: Zach Burnett --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 33834da0d..76ce863f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,9 +36,9 @@ dependencies = [ "drizzle >= 1.15.0", "webbpsf >= 1.2.1", # pysiaf required by webbpsf uses pkg_resources which doesn't - # exist in python 3.12 without setuptools. This dependency - # can be dropped when webbpsf is dropped (or pysiaf is updated - # to not require pkg_resources). + # exist in python 3.12 without setuptools. + # TODO: drop this dependency when webbpsf is dropped + # (or when pysiaf no longer requires pkg_resources). "setuptools >= 60 ; python_version >= '3.12'", ] dynamic = [ From a585f74f2ad9393f9f28159eecf7646db49494e7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:07:27 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 76ce863f2..4192a70f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,8 +36,8 @@ dependencies = [ "drizzle >= 1.15.0", "webbpsf >= 1.2.1", # pysiaf required by webbpsf uses pkg_resources which doesn't - # exist in python 3.12 without setuptools. - # TODO: drop this dependency when webbpsf is dropped + # exist in python 3.12 without setuptools. + # TODO: drop this dependency when webbpsf is dropped # (or when pysiaf no longer requires pkg_resources). "setuptools >= 60 ; python_version >= '3.12'", ]