Fix building of numpy-dev

Author: astrofrog

.continuous-integration/travis/setup_dependencies_common.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # CONDA
 conda create --yes -n test -c astropy-ci-extras python=$PYTHON_VERSION pip
@@ -17,10 +17,14 @@ then
   exit  # no more dependencies needed
 fi
 
+# CORE DEPENDENCIES
+$CONDA_INSTALL pytest Cython jinja2 psutil
+
 # NUMPY
 if [[ $NUMPY_VERSION == dev ]]
 then
-  pip install git+http://github.com/numpy/numpy.git  
+  pip install git+http://github.com/numpy/numpy.git
+  exit # exit to make sure we don't end up accidentally install numpy with conda
 else
   conda install --yes numpy=$NUMPY_VERSION
 fi
@@ -29,9 +33,6 @@ fi
 # versions are always explicitly specified.
 export CONDA_INSTALL="conda install --yes python=$PYTHON_VERSION numpy=$NUMPY_VERSION"
 
-# CORE DEPENDENCIES
-$CONDA_INSTALL pytest Cython jinja2 psutil
-
 # OPTIONAL DEPENDENCIES
 if $OPTIONAL_DEPS
 then