Merge pull request astropy#3649 from astrofrog/travis-numpy-dev

Add Travis job for numpy-dev that is allowed to fail

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,15 +17,21 @@ then
   exit  # no more dependencies needed
 fi
 
+# CORE DEPENDENCIES
+conda install --yes pytest Cython jinja2 psutil
+
 # NUMPY
-conda install --yes numpy=$NUMPY_VERSION
+if [[ $NUMPY_VERSION == dev ]]
+then
+  pip install git+http://github.com/numpy/numpy.git
+  export CONDA_INSTALL="conda install --yes python=$PYTHON_VERSION"
+else
+  conda install --yes numpy=$NUMPY_VERSION
+  export CONDA_INSTALL="conda install --yes python=$PYTHON_VERSION numpy=$NUMPY_VERSION"
+fi
 
 # Now set up shortcut to conda install command to make sure the Python and Numpy
 # 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

.travis.yml

@@ -19,6 +19,10 @@ env:
         - PYTHON_VERSION=3.4 SETUP_CMD='egg_info'
 
 matrix:
+
+    # Don't wait for allowed failures
+    fast_finish: true
+
     include:
 
         # Try MacOS X
@@ -57,10 +61,17 @@ matrix:
         - os: linux
           env: PYTHON_VERSION=2.7 NUMPY_VERSION=1.6 SETUP_CMD='test'
 
+        # Try developer version of Numpy
+        - os: linux
+          env: PYTHON_VERSION=2.7 NUMPY_VERSION=dev SETUP_CMD='test'
+
         # Do a PEP8 test
         - os: linux
           env: PYTHON_VERSION=2.7 MAIN_CMD='pep8 astropy --count' SETUP_CMD=''
 
+    allow_failures:
+      - env: PYTHON_VERSION=2.7 NUMPY_VERSION=dev SETUP_CMD='test'
+
 install:
     - source .continuous-integration/travis/setup_environment_$TRAVIS_OS_NAME.sh