Skip to content

Commit

Permalink
Merge pull request #1515 from zacharyburnett/scsb145
Browse files Browse the repository at this point in the history
[SCSB-145] require Python 3.10
  • Loading branch information
mfixstsci authored Apr 25, 2024
2 parents 17e0a49 + 55790ef commit 6ef5e9b
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 122 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,17 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
python-version: [3.9, "3.10"]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v4

- uses: mamba-org/provision-with-micromamba@v15
- uses: mamba-org/setup-micromamba@v1
with:
environment-file: ./environment_python_${{ matrix.python-version }}.yml
cache-env: true
cache-environment: true
cache-downloads: true
init-shell: bash

- run: pip install -e .[test]

Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.9"
python: "3.11"
jobs:
post_install:
- pip install sqlalchemy==1.4.46
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Getting `jwql` up and running on your own computer requires four steps, detailed

### Prerequisites

It is highly suggested that contributors have a working installation of `anaconda` or `miniconda` for Python 3.9+. Downloads and installation instructions are available here:
It is highly suggested that contributors have a working installation of `anaconda` or `miniconda` for Python 3.10+. Downloads and installation instructions are available here:

- [Miniconda](https://conda.io/miniconda.html)
- [Anaconda](https://www.continuum.io/downloads)
Expand Down Expand Up @@ -86,13 +86,13 @@ source activate base/root
Lastly, create the `jwql` environment via one of the `environment.yml` files (currently `environment_python_3.9.yml`, for python 3.9, and `environment_python_3.10.yml`, for python 3.10, are supported by `jwql`):

```
conda env create -f environment_python_3.9.yml
conda env create -f environment_python_3.10.yml
```

or

```
conda env create -f environment_python_3.10.yml
conda env create -f environment_python_3.11.yml
```

### Configuration File
Expand Down
74 changes: 0 additions & 74 deletions environment_python_3.9.yml

This file was deleted.

97 changes: 56 additions & 41 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,61 +3,74 @@ name = "jwql"
description = "The James Webb Space Telescope Quicklook Project"
readme = "README.md"
authors = [
{ name = "Matthew Bourque" },
{ name = "Lauren Chambers" },
{ name = "Misty Cracraft" },
{ name = "Mike Engesser" },
{ name = "Mees Fix" },
{ name = "Joe Filippazzo" },
{ name = "Bryan Hilbert" },
{ name = "Matthew Bourque" },
{ name = "Lauren Chambers" },
{ name = "Misty Cracraft" },
{ name = "Mike Engesser" },
{ name = "Mees Fix" },
{ name = "Joe Filippazzo" },
{ name = "Bryan Hilbert" },
]
keywords = [
"astronomy",
"python",
]
classifiers = [
"Programming Language :: Python",
]
keywords = ["astronomy", "python"]
classifiers = ["Programming Language :: Python"]
dependencies = [
"asdf",
"astropy",
"astroquery",
"bokeh>=3",
"crds",
"cryptography",
"django",
"inflection",
"jinja2",
"jsonschema",
"jwst",
"jwst_reffiles",
"matplotlib",
"numpy",
"numpydoc",
"pandas",
"psycopg2-binary",
"pysiaf",
"pyvo",
"scipy",
"sqlalchemy",
"stdatamodels",
"wtforms",
"asdf",
"astropy",
"astroquery",
"bokeh>=3",
"crds",
"cryptography",
"django",
"inflection",
"jinja2",
"jsonschema",
"jwst",
"jwst_reffiles",
"matplotlib",
"numpy",
"numpydoc",
"pandas",
"psycopg2-binary",
"pysiaf",
"pyvo",
"scipy",
"sqlalchemy",
"stdatamodels",
"wtforms",
]
dynamic = [
"version",
]
dynamic = ["version"]
requires-python = ">=3.10"

[project.optional-dependencies]
test = [
"pytest",
"pytest-cov",
"pytest-mock",
"pytest",
"pytest-cov",
"pytest-mock",
]
docs = [
"sphinx",
"sphinx_rtd_theme",
"stsci_rtd_theme",
"sphinx",
"sphinx_rtd_theme",
"stsci_rtd_theme",
]

[project.license]
file = "LICENSE"
content-type = "text/plain"

[build-system]
requires = ["setuptools>=68.0.0", "numpy", "wheel", "setuptools_scm"]
requires = [
"setuptools>=68.0.0",
"numpy",
"wheel",
"setuptools_scm",
]
build-backend = "setuptools.build_meta"

[tool.setuptools]
Expand All @@ -72,4 +85,6 @@ namespaces = false
junit_family = "xunit2"

[tool.pytest.ini_options]
norecursedirs = ["jwql/website/apps/jwql/static"]
norecursedirs = [
"jwql/website/apps/jwql/static",
]

0 comments on commit 6ef5e9b

Please sign in to comment.