diff --git a/CHANGES.rst b/CHANGES.rst index 65e1485ef3..9e8488ed56 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +1.3.3 (2021-10-05) +================== + +- Avoid using photutils 1.2.0 + + 1.3.2 (2021-09-03) ================== diff --git a/README.md b/README.md index 3d12eb24c0..498f5f0540 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ You can also install a specific version (from `jwst 0.17.0` onward): conda create -n python conda activate - 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: @@ -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 | diff --git a/docs/conf.py b/docs/conf.py index aa1edaebac..4942696c8f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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/')) @@ -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', @@ -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', ] diff --git a/setup.cfg b/setup.cfg index 643ffabc2c..09e795ca09 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 @@ -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 @@ -120,8 +120,11 @@ 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 @@ -129,6 +132,8 @@ 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