Skip to content

Commit

Permalink
set stcal to main, allow python 3.13 (#9105)
Browse files Browse the repository at this point in the history
Co-authored-by: Tyler Pauly <[email protected]>
  • Loading branch information
braingram and tapastro authored Feb 3, 2025
1 parent 0ca519c commit 51f6907
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
steps:
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: 3.12
python-version: 3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,4 @@ jobs:
coverage: codecov
pytest-results-summary: true
- linux: py312-xdist
- linux: py313-xdist
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
![STScI Logo](docs/_static/stsci_logo.png)

> [!IMPORTANT]
> JWST requires a C compiler for dependencies and is currently limited to Python 3.10, 3.11, or 3.12.
> JWST requires a C compiler for dependencies.
> [!NOTE]
> Linux and MacOS platforms are tested and supported. Windows is not currently supported.
Expand Down Expand Up @@ -56,13 +56,13 @@ Remember that all conda operations must be done from within a bash/zsh shell.

You can install the latest released version via `pip`. From a bash/zsh shell:

conda create -n <env_name> python=3.11
conda create -n <env_name> python=3.12
conda activate <env_name>
pip install jwst

You can also install a specific version:

conda create -n <env_name> python=3.11
conda create -n <env_name> python=3.12
conda activate <env_name>
pip install jwst==1.16.1

Expand All @@ -71,7 +71,7 @@ You can also install a specific version:
You can install the latest development version (not as well tested) from the
Github main branch:

conda create -n <env_name> python=3.11
conda create -n <env_name> python=3.12
conda activate <env_name>
pip install git+https://github.com/spacetelescope/jwst

Expand Down Expand Up @@ -144,7 +144,7 @@ already installed with released versions of the `jwst` package.

As usual, the first two steps are to create and activate an environment:

conda create -n <env_name> python=3.11
conda create -n <env_name> python=3.12
conda activate <env_name>

To install your own copy of the code into that environment, you first need to
Expand Down
1 change: 1 addition & 0 deletions changes/9105.general.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow python 3.13
8 changes: 4 additions & 4 deletions docs/getting_started/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ shell.

.. warning::

JWST requires a C compiler for dependencies and is currently limited to Python 3.11, or 3.12.
JWST requires a C compiler for dependencies.

.. warning::
Installation on MacOS Mojave 10.14 will fail due to lack of a stable build for dependency ``opencv-python``.
Expand All @@ -48,7 +48,7 @@ Installing Latest Release

You can install the latest released version via `pip`. From a bash/zsh shell:

| >> conda create -n <env_name> python=3.11
| >> conda create -n <env_name> python=3.12
| >> conda activate <env_name>
| >> pip install jwst
Expand All @@ -59,7 +59,7 @@ Installing Previous Releases

You can also install a specific version (from `jwst 0.17.0` onward):

| >> conda create -n <env_name> python=3.11
| >> conda create -n <env_name> python=3.12
| >> conda activate <env_name>
| >> pip install jwst==1.12.5
Expand All @@ -71,7 +71,7 @@ Installing the Development Version from Github
You can install the latest development version (not as well tested) from the
Github main branch:

| >> conda create -n <env_name> python=3.11
| >> conda create -n <env_name> python=3.12
| >> conda activate <env_name>
| >> pip install git+https://github.com/spacetelescope/jwst
Expand Down
4 changes: 2 additions & 2 deletions docs/getting_started/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ To create a conda environment specifically for the latest stable release of

::

conda create --name jwst_latest python=3.11
conda create --name jwst_latest python=3.12

This will create a new, (nearly) empty Python 3.11 environment in which you can
This will create a new, (nearly) empty Python 3.12 environment in which you can
install the `jwst` package.

**2. Install jwst from PyPi**
Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "jwst"
description = "Library for calibration of science observations from the James Webb Space Telescope"
requires-python = ">=3.11,<3.13"
requires-python = ">=3.11,<3.14"
authors = [
{ name = "JWST calibration pipeline developers" },
]
Expand All @@ -15,6 +15,7 @@ classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
dependencies = [
"asdf>=3.3,<5",
Expand All @@ -33,9 +34,7 @@ dependencies = [
"scikit-image>=0.20.0",
"scipy>=1.14.1",
"spherical-geometry>=1.2.22",
# "stcal>=1.11.0,<1.12.0",
"stcal @ git+https://github.com//kmacdonald-stsci/stcal.git@jp_3697_jump",
# "stdatamodels>=2.2.0,<2.3.0",
"stcal @ git+https://github.com/spacetelescope/stcal.git@main",
"stdatamodels @ git+https://github.com/spacetelescope/stdatamodels.git@main",
"stpipe>=0.8.0,<0.9.0",
"stsci.imagestats>=1.6.3",
Expand Down

0 comments on commit 51f6907

Please sign in to comment.