Skip to content

Commit

Permalink
Avoid photutils 1.2.0 (#6378)
Browse files Browse the repository at this point in the history
* Avoid photutils 1.2.0

* Use pytest-doctestplus sphinx extension
  • Loading branch information
jdavies-st authored Oct 6, 2021
1 parent 1e20478 commit 4cfc1f6
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
1.3.3 (2021-10-05)
==================

- Avoid using photutils 1.2.0


1.3.2 (2021-09-03)
==================

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ You can also install a specific version (from `jwst 0.17.0` onward):

conda create -n <env_name> python
conda activate <env_name>
pip install jwst==1.3.2
pip install jwst==1.3.3

Installing specific versions before `jwst 0.17.0` need to be installed from Github:

Expand Down Expand Up @@ -188,6 +188,7 @@ contact the [JWST Help Desk](https://jwsthelp.stsci.edu).

| jwst tag | DMS build | CRDS_CONTEXT | Date | Notes |
| -------- | --------- | ------------ | ---------- | ----------------------------------------------|
| 1.3.3 | B7.8.2 | 0764 | 2021-10-05 | Same as 1.3.2, but with installation bug fix |
| 1.3.2 | B7.8.2 | 0764 | 2021-09-02 | Final release candidate for B7.8.2 |
| 1.3.1 | B7.8.1 | 0742 | 2021-08-09 | Final release candidate for B7.8.1 |
| 1.3.0 | B7.8.1rc1 | 0741 | 2021-08-02 | First release candidate for B7.8.1 |
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def setup(app):
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
sys.path.insert(0, os.path.abspath('../'))
# sys.path.insert(0, os.path.abspath('../'))
sys.path.insert(0, os.path.abspath('jwst/'))
sys.path.insert(0, os.path.abspath('exts/'))

Expand Down Expand Up @@ -82,6 +82,7 @@ def check_sphinx_version(expected_version):
# ones.
extensions = [
'numfig',
'pytest_doctestplus.sphinx.doctestplus',
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
'sphinx.ext.todo',
Expand All @@ -94,7 +95,6 @@ def check_sphinx_version(expected_version):
'sphinx_automodapi.automodsumm',
'sphinx_automodapi.autodoc_enhancements',
'sphinx_automodapi.smart_resolver',
'sphinx_astropy.ext.doctest',
'sphinx_asdf',
]

Expand Down
9 changes: 7 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ install_requires =
gwcs>=0.16.1
jsonschema>=3.0.2
numpy>=1.17
photutils>=1.1.0
photutils>=1.1.0,<1.2
psutil>=5.7.2
poppy>=0.9.0
pyparsing>=2.2
Expand All @@ -55,7 +55,7 @@ docs =
sphinx-automodapi
sphinx-rtd-theme
stsci-rtd-theme
sphinx-astropy
sphinx-astropy>=1.5
sphinx-asdf>=0.1.1
test =
ci-watson>=0.3.0
Expand Down Expand Up @@ -120,15 +120,20 @@ ignore =
minversion = 4.6
norecursedirs =
docs/_build
docs/exts
jwst/timeconversion
jwst/associations/tests/data
scripts
.tox
asdf_schema_tests_enabled = true
asdf_schema_validate_default = false
asdf_schema_root = jwst/transforms/schemas jwst/datamodels/schemas
junit_family = xunit2
inputs_root = jwst-pipeline
results_root = jwst-pipeline-results
text_file_format = rst
doctest_plus = enabled
doctest_rst = enabled
addopts = --show-capture=no --open-files --report-crds-context
filterwarnings =
ignore:Models in math_functions:astropy.utils.exceptions.AstropyUserWarning
Expand Down

0 comments on commit 4cfc1f6

Please sign in to comment.