Merge pull request #41 from NelleV/fix_install

FIX installation problems

.travis.yml

@@ -8,7 +8,7 @@ notifications:
 
 env:
   global:
-    - TEST_RUN_FOLDER="/tmp" # folder where the tests are run from
+    - TEST_DIR="/tmp/pastis" # folder where the tests are run from
   matrix:
     # Ubuntu 14.04 versions
     - DISTRIB="conda" PYTHON_VERSION="2.6"
@@ -33,11 +33,11 @@ before_script:
 script:
     - python continuous_integration/show-python-packages-versions.py
     # We want to back out of the current working directory to make
-    # sure we are using nilearn installed in site-packages rather
+    # sure we are using pastis installed in site-packages rather
     # than the one from the current working directory
     # Parentheses (run in a subshell) are used to leave
     # the current directory unchanged
-    - make test
+    - bash continuous_integration/test_script.sh
 
 after_success:
     # Ignore coveralls failures as the coveralls server is not very reliable

continuous_integration/install.sh

@@ -104,3 +104,4 @@ if [[ "$COVERAGE" == "true" ]]; then
     pip install coverage coveralls
 fi
 
+python setup.py install

continuous_integration/test_script.sh

@@ -0,0 +1,16 @@
+python --version
+
+run_tests() {
+    TEST_CMD="nosetests -s -v"
+
+
+    mkdir -p $TEST_DIR
+    cd $TEST_DIR
+    TEST_CMD="$TEST_CMD --with-coverage pastis --cover-package pastis"
+    $TEST_CMD pastis
+}
+
+
+if [[ "$SKIP_TESTS" != "true" ]]; then
+    run_tests
+fi 

doc/Makefile

@@ -180,4 +180,4 @@ pseudoxml:
 
 
 deploy:
-	rsync -avz _build/html/ [email protected]:public_html/pastis/
+	rsync -avz _build/html/ nvaroquaux@ssh.cbio.ensmp.fr:public_html/pastis/

pastis/__init__.py

@@ -1,6 +1,8 @@
 from . import config
 from .io import write
 from . import externals
+from . import fastio
+from . import algorithms
 
 
 __version__ = '0.3-git'