Skip to content

Commit

Permalink
Updated infrastructure files to package-template 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
astrofrog committed May 31, 2015
1 parent 8ec31a5 commit 789a651
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 21 deletions.
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@ env:
matrix:
include:

# Do a coverage test in Python 2. This requires the latest
# development version of Astropy, which fixes some issues with
# coverage testing in affiliated packages.
# Do a coverage test in Python 2.
- python: 2.7
env: ASTROPY_VERSION=development SETUP_CMD='test --coverage' OPTIONAL_DEPS=true
env: SETUP_CMD='test --coverage' OPTIONAL_DEPS=true

# Check for sphinx doc build warnings - we do this first because it
# may run for a long time
Expand Down Expand Up @@ -117,5 +115,4 @@ script:
- python setup.py $SETUP_CMD

after_success:
# Uncomment line below if coveralls.io is set up for this package.
- if [[ $SETUP_CMD == 'test --coverage' ]]; then coveralls; fi
- if [[ $SETUP_CMD == 'test --coverage' ]]; then coveralls --rcfile='reproject/tests/coveragerc'; fi
7 changes: 4 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@ include ez_setup.py
include ah_bootstrap.py
include setup.cfg

recursive-include *.pyx *.c *.pxd
recursive-include docs *
recursive-include licenses *
recursive-include cextern *
recursive-include scripts *

prune docs/_build
prune build
prune docs/_build
prune docs/api

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

exclude *.pyc *.o
prune docs/api
global-exclude *.pyc *.o
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ For more information, including on how to install the package, see http://reproj

![screenshot](docs/images/index-4.png)

![Powered by Astropy Badge](http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat)

Note on license
===============

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
## -- Options for the edit_on_github extension ----------------------------------------

if eval(setup_cfg.get('edit_on_github')):
extensions += ['astropy.sphinx.ext.edit_on_github']
extensions += ['astropy_helpers.sphinx.ext.edit_on_github']

versionmod = __import__(setup_cfg['package_name'] + '.version')
edit_on_github_project = setup_cfg['github_project']
Expand Down
4 changes: 2 additions & 2 deletions reproject/_astropy_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ def test(package=None, test_path=None, args=None, plugins=None,
open_files : bool, optional
Fail when any tests leave files open. Off by default, because
this adds extra run time to the test suite. Works only on
platforms with a working ``lsof`` command.
this adds extra run time to the test suite. Requires the
`psutil <https://pypi.python.org/pypi/psutil>`_ package.
parallel : int, optional
When provided, run the tests in parallel on the specified
Expand Down
18 changes: 11 additions & 7 deletions reproject/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,29 @@
import os
from astropy.tests.pytest_plugins import *

from . import version


# Uncomment the following line to treat all DeprecationWarnings as
# exceptions
enable_deprecations_as_exceptions()

# Add astropy to test header information and remove unused packages.
# Pytest header customisation was introduced in astropy 1.0.

# Uncomment and customize the following lines to add/remove entries
# from the list of packages for which version numbers are displayed
# when running the tests
try:
PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
del PYTEST_HEADER_MODULES['h5py']
del PYTEST_HEADER_MODULES['Matplotlib']
except NameError: # needed to support Astropy < 1.0
pass

# Uncomment the following lines to display the version number of the
# package rather than the version number of Astropy in the top line when
# running the tests.
import os

# This is to figure out the affiliated package version, rather than
# using Astropy's
from . import version

# This is to figure out reproject version, rather than using Astropy's
try:
packagename = os.path.basename(os.path.dirname(__file__))
TESTED_VERSIONS[packagename] = version.version
Expand Down
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,7 @@
version=VERSION,
description=DESCRIPTION,
scripts=scripts,
requires=['astropy'],
install_requires=['astropy'],
provides=[PACKAGENAME],
author=AUTHOR,
author_email=AUTHOR_EMAIL,
license=LICENSE,
Expand Down

0 comments on commit 789a651

Please sign in to comment.