Skip to content

Commit

Permalink
initial a-h removal
Browse files Browse the repository at this point in the history
  • Loading branch information
shanosborne committed Feb 1, 2020
1 parent 876beeb commit cf4b6ba
Show file tree
Hide file tree
Showing 17 changed files with 234 additions and 1,289 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

79 changes: 21 additions & 58 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,85 +1,48 @@
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='coverage' TOX_ARGS=''

# 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='py37-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='py35-legacy-test'
- env: TOXENV='py36-legacy-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
Expand All @@ -88,11 +51,11 @@ before_script:
- export WEBBPSF_PATH=$PWD/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:
Expand Down
7 changes: 1 addition & 6 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ include README.rst
recursive-include webbpsf/otelm *.fits *.txt

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 *
Expand All @@ -14,7 +13,3 @@ recursive-include scripts *
exclude *.pyc *.o
prune docs/_build
prune build

recursive-include astropy_helpers *
exclude astropy_helpers/.git
exclude astropy_helpers/.gitignore
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit cf4b6ba

Please sign in to comment.