Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update setup.py to require astropy>=0.4 and numpy and scipy #143

Merged
merged 4 commits into from
Jul 19, 2014
Merged

Update setup.py to require astropy>=0.4 and numpy and scipy #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71d66b5
Increase minimum required astropy version to 0.4
mwcraig Jul 19, 2014
edd1c3d
Add numpy and scipy as dependencies
mwcraig Jul 19, 2014
809148e
Change tests to use stable astropy now that 0.4 is out
mwcraig Jul 19, 2014
b533776
Remove unnecessary development build from travis
mwcraig Jul 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
# overidden underneath. They are defined here in order to save having
# to repeat them for all configurations.
- NUMPY_VERSION=1.8
- ASTROPY_VERSION=development # UNTIL 0.4 IS OUT
- ASTROPY_VERSION=stable
- CONDA_INSTALL='conda install -c astropy-ci-extras --yes'
- PIP_INSTALL='pip install'
matrix:
Expand All @@ -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'
env: SETUP_CMD='test --coverage'

# Check for sphinx doc build warnings - we do this first because it
# may run for a long time
Expand Down
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@
version=VERSION,
description=DESCRIPTION,
scripts=scripts,
requires=['astropy'],
install_requires=['astropy>=0.3'],
install_requires=['astropy>=0.4', 'numpy', 'scipy'],
provides=[PACKAGENAME],
author=AUTHOR,
author_email=AUTHOR_EMAIL,
Expand Down