Skip to content

Commit

Permalink
first pass at removing astropy-helpers
Browse files Browse the repository at this point in the history
  • Loading branch information
shanosborne committed Jan 24, 2020
1 parent 9218064 commit dd32c5f
Show file tree
Hide file tree
Showing 13 changed files with 173 additions and 1,215 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.

67 changes: 16 additions & 51 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,79 +9,44 @@ 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=''
- CONDA_DEPENDENCIES='scipy matplotlib'

# For headless testing of code that imports PyPlot:
- MPLBACKEND=Agg
matrix:
# Make sure that egg_info works without dependencies
- SETUP_CMD='egg_info'
- TOXENV=''
- TOXARGS=''
- TOXPOSARGS=''

matrix:

include:
# do the actual tests.
# Do a coverage test in Python 3.
- python: 3.7
env: SETUP_CMD='test --coverage'
# Do a test in Python 3.7
- env: TOXENV='coverage' TOX_ARGS=''

# Check accelerated math version too
- python: 3.7
env: SETUP_CMD='test --coverage' PIP_DEPENDENCIES='numexpr'

# Check for Sphinx doc build errors
- python: 3.7
env: SETUP_CMD='build_sphinx'
CONDA_DEPENDENCIES='scipy matplotlib nbsphinx pandoc'
PIP_DEPENDENCIES='sphinx_rtd_theme stsci_rtd_theme sphinx-automodapi sphinx-issues'

- env: TOXENV='build_docs' TOX_ARGS=''

# Try Astropy development version
- env: TOXENV='py37-astrodev-test'
- python: 3.7
env: SETUP_CMD='test' ASTROPY_VERSION=development

# Try Astropy & numpy minimum supported versions,
# Try Astropy & numpy minimum supported versions,
# and older Python versions
- python: 3.5
env: NUMPY_VERSION=1.13 SETUP_CMD='test'
- env: TOXENV='py35-numpy113-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
- pip install codecov

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='poppy/tests/coveragerc'; fi
- codecov

notifications:
email:
Expand Down
8 changes: 1 addition & 7 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
include README.rst

include ez_setup.py
include ah_bootstrap.py
include setup.cfg
include pyproject.toml

recursive-include docs *
recursive-include licenses *
Expand All @@ -13,8 +11,4 @@ prune build
prune docs/_build
prune docs/api

recursive-include astropy_helpers *
exclude astropy_helpers/.git
exclude astropy_helpers/.gitignore

global-exclude *.pyc *.o
Loading

0 comments on commit dd32c5f

Please sign in to comment.