Merge pull request #55 from skearnes/travis

Don't skip pylearn2 tests
msmbuilder · Nov 14, 2014 · 24e8df4 · 24e8df4
2 parents 2a5cfd4 + 938455c
commit 24e8df4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,9 +23,11 @@ install:
   - conda create --yes -n test python=$python `cat requirements.txt | xargs`
   - source activate test
 
+  # install pip
+  - conda install --yes pip
+
   # install python2.6 backports
   - '[ "$python" = "2.6" ]
-      && conda install --yes pip
       && pip install importlib argparse
       || echo ""'
 
@@ -39,7 +41,6 @@ install:
 
   # install hyperopt
   - '[ "$hyperopt" = "0.0.2" ]
-      && conda install --yes pip
       && pip install hyperopt
       || echo ""'
   - '[ "$hyperopt" = "dev" ]