From 6bd426e199e3f2c55159a4c25c21ed55061b61c8 Mon Sep 17 00:00:00 2001 From: Satrajit Ghosh Date: Fri, 23 Nov 2012 12:03:51 -0500 Subject: [PATCH 1/4] fix: testing sklearn travis fix --- .travis.yml | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index aada9bf190..7165d7eb84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,13 @@ -# vim ft=yaml -# travis-ci.org definition for nipy build -# -# We pretend to be erlang because we need can't use the python support in -# travis-ci; it uses virtualenvs, they do not have numpy, scipy, matplotlib, -# and it is impractical to build them -language: erlang -env: - - PYTHON=python PYSUF='' - # - PYTHON=python3 PYSUF=3 : python3-numpy not currently available -install: - - sudo apt-get install $PYTHON-dev - - sudo apt-get install $PYTHON-numpy - - sudo apt-get install $PYTHON-scipy - - sudo apt-get install $PYTHON-networkx - - sudo apt-get install $PYTHON-traits - - sudo apt-get install $PYTHON-setuptools - - sudo easy_install$PYSUF nibabel # Latest pypi - - sudo apt-get install $PYTHON-nose -script: - # Change into an innocuous directory and find tests from installation - - make test +language: python +python: + - "2.7" +before_install: + - deactivate + - sudo apt-get update -qq + - sudo apt-get install -qq python-scipy python-nose + - sudo apt-get install -qq python-networkx python-traits python-setuptools + - virtualenv --system-site-packages ~/virtualenv/this + - source ~/virtualenv/this/bin/activate + - easy_install$PYSUF nibabel # Latest pypi +install: python setup.py build_ext --inplace +script: make test \ No newline at end of file From 36d3e1a56df18bc8114c263a801d4ac73cfacc21 Mon Sep 17 00:00:00 2001 From: Satrajit Ghosh Date: Fri, 23 Nov 2012 12:08:38 -0500 Subject: [PATCH 2/4] fix: remove easy_install suffix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7165d7eb84..56011b6871 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,6 @@ before_install: - sudo apt-get install -qq python-networkx python-traits python-setuptools - virtualenv --system-site-packages ~/virtualenv/this - source ~/virtualenv/this/bin/activate - - easy_install$PYSUF nibabel # Latest pypi + - easy_install nibabel install: python setup.py build_ext --inplace script: make test \ No newline at end of file From 4ae6dd6c408bfc93233f241b801db326ccc0d20e Mon Sep 17 00:00:00 2001 From: Satrajit Ghosh Date: Fri, 23 Nov 2012 12:12:09 -0500 Subject: [PATCH 3/4] fix: install nibabel in python dir --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 56011b6871..08ccd71c5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -qq python-scipy python-nose - sudo apt-get install -qq python-networkx python-traits python-setuptools + - sudo easy_install nose - virtualenv --system-site-packages ~/virtualenv/this - source ~/virtualenv/this/bin/activate - - easy_install nibabel install: python setup.py build_ext --inplace script: make test \ No newline at end of file From 8e15adb284da48cb7588a03a6498d630b64ecf2f Mon Sep 17 00:00:00 2001 From: Satrajit Ghosh Date: Fri, 23 Nov 2012 12:12:38 -0500 Subject: [PATCH 4/4] fix: add missing nibabel --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 08ccd71c5a..12c134b505 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -qq python-scipy python-nose - sudo apt-get install -qq python-networkx python-traits python-setuptools - - sudo easy_install nose + - sudo easy_install nibabel - virtualenv --system-site-packages ~/virtualenv/this - source ~/virtualenv/this/bin/activate install: python setup.py build_ext --inplace