From 52287d6dd8e24da7c9ed80ddc3eba523018cf759 Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Thu, 7 May 2015 09:35:14 +0200 Subject: [PATCH] Always install SciPy since it is now a required dependency --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 380fa2a8f..e48d85076 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,12 +88,12 @@ install: - source activate test # CORE DEPENDENCIES - - if [[ $SETUP_CMD != egg_info ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION pytest pip Cython jinja2; fi + - if [[ $SETUP_CMD != egg_info ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION pytest pip Cython jinja2 scipy; fi - if [[ $SETUP_CMD != egg_info ]]; then $PIP_INSTALL pytest-xdist; fi # ASTROPY - if [[ $SETUP_CMD != egg_info ]] && [[ $ASTROPY_VERSION == development ]]; then $PIP_INSTALL git+http://github.com/astropy/astropy.git#egg=astropy; fi - - if [[ $SETUP_CMD != egg_info ]] && [[ $ASTROPY_VERSION == stable ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION astropy scipy; fi + - if [[ $SETUP_CMD != egg_info ]] && [[ $ASTROPY_VERSION == stable ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION astropy; fi # OPTIONAL DEPENDENCIES # Here you can add any dependencies your package may have. You can use