Merge pull request lisa-lab#94 from abergeron/pip_travis

nouiz · nouiz · commit 205370552221 · 2015-07-03T21:48:43.000-04:00
Stop using --no-deps when installing theano.
diff --git a/.travis.yml b/.travis.yml
@@ -1,28 +1,22 @@
 # After changing this file, check it on:
 # http://lint.travis-ci.org/
 
-#We can't get scipy installed with the python language
-#So we will use the system python from the c language.
-language: c
-#language: python
+language: python
 #python:
-#  - "2.5"
 #  - "2.7"
 #  - "3.2"
 # command to install dependencies
 before_install:
-#zlib1g-dev is needed to allow PIL to uncompress the dataset.
-  - sudo apt-get update
-  - sudo apt-get install -qq libatlas3gf-base libatlas-dev zlib1g-dev zip unzip zlibc libzip-dev libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev python-numpy python-scipy python-pip python-nose python-yaml pyflakes python-imaging
+  - 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/travis/miniconda/bin:$PATH
+  - conda update --yes conda
 
 install:
-#  - "pip install -q numpy --use-mirrors"
-# Use Pillow instead of PIL as it is better packaged
-#  - "pip install -q Pillow --use-mirrors"
-#If we don't install numpy before SciPy 0.10.1, the SciPy installations fails.
-#  - "pip install -q scipy --use-mirrors"
-  - "sudo pip install six"
-  - "sudo pip install --no-deps git+git://github.com/Theano/Theano.git"
+  - conda create --yes -q -n pyenv mkl python=2.7 numpy scipy pip nose yaml pyflakes pillow pyparsing=1.5
+  - source activate pyenv
+  - pip install git+git://github.com/Theano/Theano.git
 
 env:
   - PART="test.py:test_logistic_sgd test.py:test_logistic_cg test.py:test_mlp test.py:test_convolutional_mlp test.py:test_dA"
