Skip to content

Commit

Permalink
Merge branch 'develop' into remove-readnoise-bokeh
Browse files Browse the repository at this point in the history
  • Loading branch information
mfixstsci authored Oct 13, 2023
2 parents 6cdb3f7 + b09eff7 commit d918401
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 75 deletions.
44 changes: 22 additions & 22 deletions environment_python_3.10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,49 +22,49 @@ channels:
- defaults

dependencies:
- astropy=5.3.2
- astropy=5.3.4
- beautifulsoup4=4.12.2
- bokeh=2.4.3
- celery=5.3.1
- cryptography=41.0.3
- django=4.2.3
- celery=5.3.4
- cryptography=41.0.4
- django=4.2.6
- inflection=0.5.1
- ipython=8.14.0
- ipython=8.16.1
- jinja2=3.1.2
- jsonschema=4.19.0
- matplotlib=3.7.2
- nodejs=20.5.1
- jsonschema=4.19.1
- matplotlib=3.8.0
- nodejs=20.8.0
- numpy=1.25.2
- numpydoc=1.5.0
- pandas=2.0.3
- pandas=2.1.1
- pip=23.2.1
- postgresql=15.4
- psycopg2=2.9.6
- pytest=7.4.0
- psycopg2=2.9.7
- pytest=7.4.2
- pytest-cov=4.1.0
- pytest-mock=3.11.1
- python=3.10.12
- pyyaml=6.0
- redis
- ruff=0.0.285
- pyyaml=6.0.1
- redis=5.0.0
- ruff=0.0.292
- scipy=1.9.3
- setuptools=68.0.0
- sphinx=6.2.1
- sphinx_rtd_theme=1.2.2
- sqlalchemy=2.0.20
- setuptools=68.2.2
- sphinx=7.2.6
- sphinx_rtd_theme=1.3.0
- sqlalchemy=2.0.21
- twine=4.0.2
- wtforms=3.0.1

- pip:
- astroquery==0.4.6
- bandit==1.7.5
- jwst==1.11.4
- jwst==1.12.3
- pysiaf==0.20.0
- pysqlite3==0.5.1
- pysqlite3==0.5.2
- pyvo==1.4.2
- redis==5.0.0
- selenium==4.11.2
- stdatamodels==1.7.2
- selenium==4.13.0
- stdatamodels==1.8.3
- stsci_rtd_theme==1.0.0
- vine==5.0.0
- git+https://github.com/spacetelescope/jwst_reffiles
Expand Down
44 changes: 22 additions & 22 deletions environment_python_3.9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,49 +22,49 @@ channels:
- defaults

dependencies:
- astropy=5.3.2
- astropy=5.3.3
- beautifulsoup4=4.12.2
- bokeh=2.4.3
- celery=5.3.1
- cryptography=41.0.3
- django=4.2.3
- celery=5.3.4
- cryptography=41.0.4
- django=4.2.5
- inflection=0.5.1
- ipython=8.14.0
- ipython=8.16.1
- jinja2=3.1.2
- jsonschema=4.19.0
- matplotlib=3.7.2
- nodejs=20.5.1
- jsonschema=4.19.1
- matplotlib=3.8.0
- nodejs=20.8.0
- numpy=1.25.2
- numpydoc=1.5.0
- pandas=2.0.3
- pandas=2.1.1
- pip=23.2.1
- postgresql=15.4
- psycopg2=2.9.6
- pytest=7.4.0
- psycopg2=2.9.7
- pytest=7.4.2
- pytest-cov=4.1.0
- pytest-mock=3.11.1
- python=3.9.17
- pyyaml=6.0
- redis
- ruff=0.0.285
- pyyaml=6.0.1
- redis=5.0.0
- ruff=0.0.292
- scipy=1.9.3
- setuptools=68.0.0
- sphinx=6.2.1
- sphinx_rtd_theme=1.2.2
- sqlalchemy=2.0.20
- setuptools=68.2.2
- sphinx=7.2.6
- sphinx_rtd_theme=1.3.0
- sqlalchemy=2.0.21
- twine=4.0.2
- wtforms=3.0.1

- pip:
- astroquery==0.4.6
- bandit==1.7.5
- jwst==1.11.4
- jwst==1.12.3
- pysiaf==0.20.0
- pysqlite3==0.5.1
- pysqlite3==0.5.2
- pyvo==1.4.2
- redis==5.0.0
- selenium==4.11.2
- stdatamodels==1.7.2
- selenium==4.13.0
- stdatamodels==1.8.3
- stsci_rtd_theme==1.0.0
- vine==5.0.0
- git+https://github.com/spacetelescope/jwst_reffiles
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ file = "LICENSE"
content-type = "text/plain"

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

[tool.setuptools]
Expand Down
40 changes: 20 additions & 20 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
astropy==5.3.2
astropy==5.3.3
astroquery==0.4.6
bandit==1.7.5
beautifulsoup4==4.12.2
bokeh==2.4.3
celery==5.3.1
celery==5.3.4
cryptography==41.0.4
django==4.2.3
django==4.2.5
inflection==0.5.1
ipython==8.14.0
ipython==8.16.1
jinja2==3.1.2
jsonschema==4.19.0
jwst==1.11.4
matplotlib==3.7.2
nodejs==20.5.1
jsonschema==4.19.1
jwst==1.12.3
matplotlib==3.8.0
nodejs==20.8.0
numpy==1.25.2
numpydoc==1.5.0
pandas==2.0.3
pandas==2.1.1
psycopg2-binary==2.9.7
pysiaf==0.20.0
pysqlite3==0.5.1
pytest==7.4.0
pysqlite3==0.5.2
pytest==7.4.2
pytest-cov==4.1.0
pytest-mock==3.11.1
pyvo==1.4.2
pyyaml==6.0
pyyaml==6.0.1
redis==5.0.0
ruff==0.0.285
scipy==1.10.0
selenium==4.11.2
setuptools==68.0.0
sphinx==6.2.1
sphinx_rtd_theme==1.2.2
sqlalchemy==2.0.20
stdatamodels==1.7.2
ruff==0.0.292
scipy==1.9.3
selenium==4.13.0
setuptools==68.2.2
sphinx==7.2.6
sphinx_rtd_theme==1.3.0
sqlalchemy==2.0.21
stdatamodels==1.8.3
stsci_rtd_theme==1.0.0
twine==4.0.2
vine==5.0.0
Expand Down
19 changes: 9 additions & 10 deletions rtd_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
sphinx_automodapi==0.15.0
sphinx_automodapi>=0.15.0
bokeh==2.4.3
celery==5.3.1
cython==3.0.0
django==4.2.3
docutils==0.18.1
jwst==1.11.4
celery==5.3.4
cython>=3.0.0
django==4.2.5
docutils>=0.18.1
jwst==1.12.3
pygments==2.16.1
pytest==7.4.0
pytest==7.4.2
redis==5.0.0
selenium==4.11.2
sphinx==6.2.1
sphinx_rtd_theme==1.2.2
selenium==4.13.0
sphinx==7.2.6
stsci_rtd_theme==1.0.0
tomli==2.0.1
git+https://github.com/spacetelescope/jwst_reffiles

0 comments on commit d918401

Please sign in to comment.