Skip to content

Commit

Permalink
No cruft (#47)
Browse files Browse the repository at this point in the history
* Return to vanilla

* Update CI

* Fix docs requirements

* Allow warnings in docs. Ditch setup_package.py from tests

* See if we cant use numpy dev

* Report unknown version

* Remove more astropy-specific configuration

* Remove scripts and entry_points

* Update URL
  • Loading branch information
jhunkeler authored and jdavies-st committed Jun 24, 2019
1 parent e4c567a commit 291b8b6
Show file tree
Hide file tree
Showing 35 changed files with 130 additions and 1,504 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ parts
bin
var
sdist
pip-wheel-metadata
develop-eggs
.installed.cfg
distribute-*.tar.gz
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

25 changes: 14 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,36 @@ addons:
- texlive-latex-extra
- dvipng
- graphviz
- libopenblas-base
- libopenblas-dev

env:
global:
- NUMPY_VERSION=1.16
- DEV="--pre --upgrade numpy git+https://github.com/astropy/astropy"
- DEV="--upgrade cython git+https://github.com/numpy/numpy git+https://github.com/astropy/astropy"

matrix:
# Don't wait for allowed failures
fast_finish: true
include:
# Run tests
- env: TEST_COMMAND='python setup.py test'
PIP_DEPENDENCIES='.[test]'
- env: TEST_COMMAND='pytest'
PIP_DEPENDENCIES='-e .[test]'
# Build sphinx documentation with warnings
- env: TEST_COMMAND='python setup.py build_sphinx -W'
PIP_DEPENDENCIES='.[docs]'
- env: TEST_COMMAND='python setup.py build_sphinx'
PIP_DEPENDENCIES='-e .[docs]'
# Test with python 3.7
- python: 3.7
env: TEST_COMMAND='python setup.py test'
PIP_DEPENDENCIES='.[test]'
env: TEST_COMMAND='pytest'
PIP_DEPENDENCIES='-e .[test]'
# Cron job test with dev versions of dependencies and python 3.6
- env: PIP_DEPENDENCIES="${DEV} .[test]"
TEST_COMMAND='python setup.py test'
- env: PIP_DEPENDENCIES="${DEV} -e .[test]"
TEST_COMMAND='pytest'
# EVENT_TYPE='cron'
# Cron job test with dev versions of dependencies and python 3.7
- python: 3.7
env: PIP_DEPENDENCIES="${DEV} .[test]"
TEST_COMMAND='python setup.py test'
env: PIP_DEPENDENCIES="${DEV} -e .[test]"
TEST_COMMAND='pytest'
# EVENT_TYPE='cron'
# PEP8 check
# Strict PEP8 check, an allowed failure below
Expand All @@ -47,6 +49,7 @@ matrix:
- env: TEST_COMMAND='flake8 --count'

install:
- pip install --upgrade pip
- pip install numpy~=$NUMPY_VERSION
- if [[ -n $PIP_DEPENDENCIES ]]; then pip install $PIP_DEPENDENCIES; fi
- pip install flake8
Expand Down
11 changes: 4 additions & 7 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
include README.rst
include CODE_OF_CONDUCT.md

include ah_bootstrap.py
include setup.cfg

recursive-include *.pyx *.c *.pxd
recursive-include *.c *
recursive-include *.pxd *
recursive-include *.pyx *
recursive-include docs *
recursive-include licenses *
recursive-include cextern *
Expand All @@ -13,9 +13,6 @@ recursive-include scripts *
prune build
prune docs/_build
prune docs/api

recursive-include astropy_helpers *
exclude astropy_helpers/.git
exclude astropy_helpers/.gitignore
prune drizzle/tests/data

global-exclude *.pyc *.o
Loading

0 comments on commit 291b8b6

Please sign in to comment.