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
This commit is contained in:
Philip Paquette
2016-08-03 22:19:22 -04:00
committed by Jonas Schneider
parent c2f70d0656
commit 216d90fc91

View File

@@ -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: