Skip to content

Commit

Permalink
Merge pull request #101 from mwcraig/remove-helpers
Browse files Browse the repository at this point in the history
Remove astropy helpers
  • Loading branch information
mwcraig committed Dec 30, 2019
2 parents 2128835 + 0aed5ff commit 68560e3
Show file tree
Hide file tree
Showing 16 changed files with 168 additions and 1,298 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ __pycache__
*.c

# Other generated files
*/version.py
*/cython_version.py
htmlcov
.coverage
MANIFEST
.ipynb_checkpoints
example_notebooks/test.png
*/version.py
pip-wheel-metadata/

# Sphinx
docs/api
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ python:
system_packages: true
install:
- requirements: docs/requirements.txt
- method: setuptools
- method: pip
path: .

submodules:
Expand Down
17 changes: 7 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
- NUMPY_VERSION=stable
- ASTROPY_VERSION=stable
- GINGA_VERSION=stable
- MAIN_CMD='python setup.py'
- MAIN_CMD='tox -e'
- SETUP_CMD='test'
- PIP_DEPENDENCIES=''
- EVENT_TYPE='pull_request push'
Expand Down Expand Up @@ -61,12 +61,9 @@ matrix:
fast_finish: true

include:
- stage: Initial tests
env: SETUP_CMD='egg_info'

# Do a coverage test.
- stage: Initial tests
env: SETUP_CMD='test --coverage'
env: SETUP_CMD='coverage'

# Now try Astropy dev with the latest Python and LTS with Python 3.x.
- stage: Comprehensive tests
Expand All @@ -87,7 +84,6 @@ matrix:

- stage: Comprehensive tests
os: windows
env: SETUP_CMD='test'

# Do a PEP8 test with flake8
- stage: Comprehensive tests
Expand All @@ -96,7 +92,6 @@ matrix:
# Try MacOS X
- stage: Cron tests
os: osx
env: SETUP_CMD='test'

install:

Expand Down Expand Up @@ -128,9 +123,11 @@ install:
- if [[ $GINGA_VERSION == stable ]]; then pip -q install ginga; fi

script:
- pip install tox tox-pypi-filter --upgrade
- pip install -e .
- $MAIN_CMD $SETUP_CMD

after_success:
# If coveralls.io is set up for this package, uncomment the line below.
# The coveragerc file may be customized as needed for your package.
# - if [[ $SETUP_CMD == *coverage* ]]; then coveralls --rcfile='astrowidgets/tests/coveragerc'; fi
# Upload coverage to codecov
- pip install codecov
- codecov
21 changes: 1 addition & 20 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include README.rst
include CHANGES.rst
include LICENSE.rst

include ah_bootstrap.py
include pyproject.toml
include setup.cfg
include astrowidgets/tests/coveragerc

Expand All @@ -14,25 +14,6 @@ prune build
prune docs/_build
prune docs/api

# the next few stanzas are for astropy_helpers. It's derived from the
# astropy_helpers/MANIFEST.in, but requires additional includes for the actual
# package directory and egg-info.

include astropy_helpers/README.rst
include astropy_helpers/CHANGES.rst
include astropy_helpers/LICENSE.rst
recursive-include astropy_helpers/licenses *

include astropy_helpers/ah_bootstrap.py

recursive-include astropy_helpers/astropy_helpers *.py *.pyx *.c *.h *.rst
recursive-include astropy_helpers/astropy_helpers.egg-info *
# include the sphinx stuff with "*" because there are css/html/rst/etc.
recursive-include astropy_helpers/astropy_helpers/sphinx *

prune astropy_helpers/build
prune astropy_helpers/astropy_helpers/tests

# Miscellaneous

global-exclude *.pyc *.o

0 comments on commit 68560e3

Please sign in to comment.