Merge pull request #371 from spacetelescope/develop

Release 0.9.1

.gitignore

@@ -4,6 +4,7 @@
 *.o
 *.so
 __pycache__
+pip-wheel-metadata
 
 # Ignore .c files by default to avoid including generated code. If you want to
 # add a non-generated .c extension, use `git add -f filename.c`.

.travis.yml

@@ -1,99 +1,71 @@
-language: python
-
-python:
-    - 3.7
+language: c
 
 # Setting sudo to false opts in to Travis-CI container-based builds.
 sudo: false
 
+
 env:
     global:
-        # The following versions are the 'default' for tests, unless
-        # overridden underneath. They are defined here in order to save having
-        # to repeat them for all configurations.
-        - NUMPY_VERSION=stable
-        - ASTROPY_VERSION=stable
-        - SETUP_CMD='test'
-        - PIP_DEPENDENCIES='git+https://github.com/spacetelescope/poppy.git#egg=poppy jwxml git+https://github.com/spacetelescope/pysiaf.git#egg=pysiaf'
-        - CONDA_DEPENDENCIES='scipy matplotlib cython photutils'
-
-        # For headless testing of code that imports PyPlot:
-        - MPLBACKEND=Agg
+        - TOXENV=''
+        - TOXARGS=''
+        - TOXPOSARGS=''
 
-matrix:
+        - TOX_CMD='tox --'
+        - TOX_ARGS=''
 
-    # Don't wait for allowed failures
-    fast_finish: true
+matrix:
 
     include:
         # do the actual tests against dev version of POPPY
 
         # Do a coverage test in Python 3.
-        - python: 3.7
-          env: SETUP_CMD='test --coverage'
+        - env: TOXENV='py38-poppydev-pysiafdev-cov'
 
         # Check for Sphinx doc build errors
-        - python: 3.7
-          env: SETUP_CMD='build_sphinx'
-                CONDA_DEPENDENCIES='scipy matplotlib nbsphinx pandoc sphinx-issues'
-                PIP_DEPENDENCIES='git+https://github.com/spacetelescope/poppy.git#egg=poppy jwxml git+https://github.com/spacetelescope/pysiaf.git#egg=pysiaf nbsphinx sphinx_rtd_theme stsci_rtd_theme sphinx-automodapi'
+        - env: TOXENV='docbuild' TOX_ARGS=''
 
         # Try Astropy development version
-        - python: 3.7
-          env: SETUP_CMD='test' ASTROPY_VERSION=development
+        - env: TOXENV='py38-astropydev-test'
 
         # Try minimum supported versions
-        - python: 3.5
-          env: SETUP_CMD='test' NUMPY_VERSION=1.13
-        - python: 3.6
-          env: SETUP_CMD='test' NUMPY_VERSION=1.13
+        - env: TOXENV='py36-legacy36-test'
 
         # Try released POPPY
-        - python: 3.7
-          env: SETUP_CMD='test' PIP_DEPENDENCIES='poppy pysiaf'
+        - env: TOXENV='py37-stable-test'
 
     allow_failures:
         # Released POPPY and/or pySIAF may be missing new functionality used by dev WebbPSF
-        - env: SETUP_CMD='test' PIP_DEPENDENCIES='poppy pysiaf'
+        - env: TOXENV='py37-stable-test'
 
 install:
-
-    # We now use the ci-helpers package to set up our testing environment.
-    # This is done by using Miniconda and then using conda and pip to install
-    # dependencies. Which dependencies are installed using conda and pip is
-    # determined by the CONDA_DEPENDENCIES and PIP_DEPENDENCIES variables,
-    # which should be space-delimited lists of package names. See the README
-    # in https://github.com/astropy/ci-helpers for information about the full
-    # list of environment variables that can be used to customize your
-    # environment. In some cases, ci-helpers may not offer enough flexibility
-    # in how to install a package, in which case you can have additional
-    # commands in the install: section below.
-
     - git clone git://github.com/astropy/ci-helpers.git
-    - source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh
-
-    # As described above, using ci-helpers, you should be able to set up an
-    # environment with dependencies installed using conda and pip, but in some
-    # cases this may not provide enough flexibility in how to install a
-    # specific dependency (and it will not be able to install non-Python
-    # dependencies). Therefore, you can also include commands below (as
-    # well as at the start of the install section or in the before_install
-    # section if they are needed before setting up conda) to install any
-    # other dependencies.
+    - source ci-helpers/travis/setup_conda.sh
+    - pip install tox tox-conda>=0.2
+    - pip install --user codecov
 
 before_script:
     # Get WebbPSF data files (just a subset of the full 250 MB!) and set up environment variable
     - wget https://stsci.box.com/shared/static/qcptcokkbx7fgi3c00w2732yezkxzb99.gz -O /tmp/minimal-webbpsf-data.tar.gz
     - tar -xzvf /tmp/minimal-webbpsf-data.tar.gz
-    - export WEBBPSF_PATH=$PWD/webbpsf-data
+    - export WEBBPSF_PATH="${TRAVIS_BUILD_DIR}/webbpsf-data"
 
 script:
-   - python setup.py $SETUP_CMD
+   - conda info
+   - $TOX_CMD $TOX_ARGS
 
 after_success:
-    # coveralls.io integration
-    - if [[ $SETUP_CMD == 'test --coverage' ]]; then coveralls --rcfile='webbpsf/tests/coveragerc'; fi
+   - codecov
 
 notifications:
   email:
-    - [email protected]
+  - [email protected]
+
+deploy:
+  provider: pypi
+  username: "__token__"
+  password:
+    secure: McRW3+IUUn8m/wp/wop3tQax+pAgPhfaiDejbpQrQDMxWo2Uanyy/kcp7MO1MWeItmf/rPCcy3/LKD4EYG4/RU4rSrn/NjV8luYsM89Sti8vAmZ9yiC5u1mDLb0pknWt0KiL8se7pHz2myhg6ddkou44cYk3O9f8a6q/frygXExeOn7fsiZQCGX+PdyJQGVFnoOosHPRKk8kAXr2vlg+mBpEnGt+Pd2KorqIaz4Co6IaTE3VDf+Zo9mbiOsgY8CYbOhH0a3u3U5l12qUmCeQPw7+guJcy0zlBieiEjUB6aPN0VotRaLidc12N/pqZ0hXVVwgB/XKq0JJrECfsNQIxGDZCfKeadcwlFCiEki/zvvH7f2E5fuA4rAAej77tZC3AJXUxpBobv9Eed+MoLZCYq7F74CCuX6MbqUmoTtZdG75uRUfFf/mcTe3dy4cCuIrJG06/I+M0IUdyfCsFkE7HoXiSGJPcSvUsdI+lCyXYZC5l6d02n/v6rz8QTrQAbrveh5VSArj2XQCvNa0YiBz54eIzr9Fe3UQmVw8wlRdmNOcDo0LejwDYL44mm6MbX2VyPFyGqPRbe+NSSPC/LHdBCGEQX01HkmV3kmLFXnSIzpIbjJRzl+dRvN7CVSS3XL8efwPvqsmXReK+VnZ9IzMvYWboK1Bg4/Ri5PRSMKCWhc=
+  on:
+    branch: stable
+    tags: true
+  skip_existing: true

MANIFEST.in

@@ -1,10 +1,10 @@
 include README.rst
 recursive-include  webbpsf/otelm *.fits *.txt
+recursive-include webbpsf/tests/surs *.xml
 
 recursive-include webbpsf *.pyx *.c
-include ez_setup.py
-include ah_bootstrap.py
 include setup.cfg
+include pyproject.toml
 
 recursive-include docs *
 recursive-include licenses *
@@ -14,7 +14,3 @@ recursive-include scripts *
 exclude *.pyc *.o
 prune docs/_build
 prune build
-
-recursive-include astropy_helpers *
-exclude astropy_helpers/.git
-exclude astropy_helpers/.gitignore

README.rst

@@ -1,5 +1,5 @@
-WebbPSF: Simulated Point Spread Functions for JWST and WFIRST
-=============================================================
+WebbPSF: Simulated Point Spread Functions for the James Webb and Nancy Grace Roman Space Telescopes
+===================================================================================================
 
 .. image:: docs/readme_fig.png
 
@@ -11,8 +11,8 @@ WebbPSF: Simulated Point Spread Functions for JWST and WFIRST
    :target: https://travis-ci.org/spacetelescope/webbpsf
    :alt: Badge showing continuous integration test status
 
-.. image:: https://coveralls.io/repos/github/spacetelescope/webbpsf/badge.svg?branch=master
-   :target: https://coveralls.io/github/spacetelescope/webbpsf?branch=master
+.. image:: https://codecov.io/gh/spacetelescope/webbpsf/branch/master/graph/badge.svg
+  :target: https://codecov.io/gh/spacetelescope/webbpsf
 
 .. image:: https://img.shields.io/badge/ascl-1504.007-blue.svg?colorB=262255
    :target: http://ascl.net/1504.007
@@ -22,11 +22,11 @@ flagship infrared space telescope. WebbPSF can simulate images for any of the
 four science instruments plus the fine guidance sensor, including both direct
 imaging and coronagraphic modes.
 
-WebbPSF also supports simulating PSFs for the upcoming Wide Field Infrared Survey Telescope (WFIRST),
+WebbPSF also supports simulating PSFs for the upcoming Nancy Grace Roman Space Telescope (formerly WFIRST),
 including its Wide Field Instrument and a preliminary version of the Coronagraph Instrument.
 
 Developed by Marshall Perrin, Joseph Long, Neil Zimmerman, Robel Geda, Shannon
-Osborne, Marcio Melendez Hernandez, Lauren Chambers, Keira Brooks, and collaborators, 2010-2018.
+Osborne, Marcio Melendez Hernandez, Lauren Chambers, Keira Brooks, Charles-Phillipe Lajoie, Jarron Leisenring, Alden Jurling, and collaborators, 2010-2020.
 
 Documentation can be found online at https://webbpsf.readthedocs.io