From 71d66b579e18b14a8309c62aac13b1d7a12d137d Mon Sep 17 00:00:00 2001 From: Matthew Craig Date: Fri, 18 Jul 2014 19:40:17 -0500 Subject: [PATCH 1/4] Increase minimum required astropy version to 0.4 --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 38391992..8b18b99b 100755 --- a/setup.py +++ b/setup.py @@ -94,8 +94,7 @@ version=VERSION, description=DESCRIPTION, scripts=scripts, - requires=['astropy'], - install_requires=['astropy>=0.3'], + install_requires=['astropy>=0.4'], provides=[PACKAGENAME], author=AUTHOR, author_email=AUTHOR_EMAIL, From edd1c3d1d5c0bcf679459e8bca6e58d0e63aaf09 Mon Sep 17 00:00:00 2001 From: Matthew Craig Date: Fri, 18 Jul 2014 19:45:43 -0500 Subject: [PATCH 2/4] Add numpy and scipy as dependencies Closes #141 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8b18b99b..c6224123 100755 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ version=VERSION, description=DESCRIPTION, scripts=scripts, - install_requires=['astropy>=0.4'], + install_requires=['astropy>=0.4', 'numpy', 'scipy'], provides=[PACKAGENAME], author=AUTHOR, author_email=AUTHOR_EMAIL, From 809148e84e4ad83cfc323e97f33bd8b18f82e3c3 Mon Sep 17 00:00:00 2001 From: Matthew Craig Date: Fri, 18 Jul 2014 19:51:27 -0500 Subject: [PATCH 3/4] Change tests to use stable astropy now that 0.4 is out --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 58874c63..c1a0d6a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: From b533776117b76e87290c1382ec44957f1c518c10 Mon Sep 17 00:00:00 2001 From: Matthew Craig Date: Fri, 18 Jul 2014 20:04:22 -0500 Subject: [PATCH 4/4] Remove unnecessary development build from travis Now that astropy 0.4 is out the coverage build no longer needs to use the development version. --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1a0d6a6..32794c12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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