Skip to content

Commit

Permalink
Partially revert #8042 and add CI in order to allow Python 3.12 suppo…
Browse files Browse the repository at this point in the history
…rt. (#8093)

Co-authored-by: Howard Bushouse <[email protected]>
  • Loading branch information
WilliamJamieson and hbushouse authored Dec 5, 2023
1 parent 870f9de commit f13f8f5
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 17 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
check:
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
with:
default_python: "3.11"
default_python: "3.12"
envs: |
- linux: check-style
- linux: check-security
Expand All @@ -70,10 +70,11 @@ jobs:
- linux: py39-sdpdeps-xdist
- linux: py310-xdist
- linux: py311-xdist
- linux: py312-xdist
- macos: py311-xdist
pytest-results-summary: true
- linux: py311-stdevdeps-xdist
- linux: py311-devdeps-xdist
- linux: py312-devdeps-xdist
- linux: py311-xdist-cov
coverage: codecov
pytest-results-summary: true
7 changes: 4 additions & 3 deletions .github/workflows/ci_cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@ jobs:
- macos: py39-xdist
- macos: py39-sdpdeps-xdist
- macos: py310-xdist
- macos: py312-xdist
- windows: py311-xdist
pytest-results-summary: true
- linux: py311-pyargs-xdist
- linux: py311-devdeps-xdist
- linux: py312-devdeps-xdist
pytest-results-summary: true
- macos: py311-devdeps-xdist
- macos: py312-devdeps-xdist
pytest-results-summary: true
- windows: py311-devdeps-xdist
- windows: py312-devdeps-xdist
pytest-results-summary: true
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ extract_2d
general
-------

- Add lack of python 3.12 support to project metadata [#8042]

- Increase asdf maximum version to 4. [#8018]

- Remove upper version limit for scipy. [#8033]

- Remove the use of ``pkg_resources`` by ``jwst``. [#8095]

- Fix Python 3.12 support. [#8093]

outlier_detection
-----------------

Expand Down
13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@

![STScI Logo](docs/_static/stsci_logo.png)

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

**Until Python 3.12 is supported, fresh conda environments will require setting the
python version to one of the three supported versions.**
**JWST requires Python 3.9 or above and a C compiler for dependencies.**

**Linux and MacOS platforms are tested and supported. Windows is not currently supported.**

Expand Down Expand Up @@ -53,13 +50,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
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
conda activate <env_name>
pip install jwst==1.9.4

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

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

Expand Down Expand Up @@ -120,7 +117,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
conda activate <env_name>

To install your own copy of the code into that environment, you first need to
Expand Down
3 changes: 3 additions & 0 deletions jwst/jump/jump_step.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
from ..stpipe import Step
from .jump import run_detect_jumps
import time
import multiprocessing

__all__ = ["JumpStep"]

multiprocessing.set_start_method('forkserver', force=True)


class JumpStep(Step):
"""
Expand Down
3 changes: 3 additions & 0 deletions jwst/ramp_fitting/ramp_fit_step.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@
import logging
import copy
import warnings
import multiprocessing

log = logging.getLogger(__name__)
log.setLevel(logging.DEBUG)

multiprocessing.set_start_method('forkserver', force=True)


__all__ = ["RampFitStep"]

Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ classifiers =
Operating System :: POSIX
Programming Language :: Python :: 3
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12

[options]
zip_safe = False
python_requires = >=3.9,<3.12
python_requires = >=3.9
setup_requires =
setuptools_scm
install_requires =
Expand Down

0 comments on commit f13f8f5

Please sign in to comment.