From 216d90fc9179b1f4b52f61b4e959b510ec132c20 Mon Sep 17 00:00:00 2001
From: Philip Paquette <pcpaquette@gmail.com>
Date: Wed, 3 Aug 2016 22:19:22 -0400
Subject: [PATCH] Merge pull request #271 from
 ppaquette:ppaquette-broken-build-20160803: Fix Travis build

* Fixed broken build - nose2 module incorrectly imported from

* Removed tox from travis.xml, readded nose2 to tox.ini
---
 .travis.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9addbc7a3..855d9a8a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,10 +37,16 @@ before_install:
   # recording.) We should debug the memory usage at some stage, but
   # simply setting overcommit is a good starting point.
   - sudo sysctl -w vm.overcommit_memory=1
+  # Installs Miniconda to avoid having to compile NumPy, SciPy, etc.
+  - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh && chmod +x miniconda.sh && ./miniconda.sh -b && export PATH=$HOME/miniconda2/bin:$PATH && conda update --yes conda
 env:
   - DISPLAY=:12
-install: pip install tox-travis
-script: tox
+install:
+  - conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy
+  - pip install -r requirements.txt
+  - pip install -r requirements_dev.txt
+script:
+  - nose2
 
 notifications:
   slack: