Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX installation problems #41

Merged
merged 2 commits into from
Jul 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions continuous_integration/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,4 @@ if [[ "$COVERAGE" == "true" ]]; then
pip install coverage coveralls
fi

python setup.py install
16 changes: 16 additions & 0 deletions continuous_integration/test_script.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 2 additions & 0 deletions pastis/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from . import config
from .io import write
from . import externals
from . import fastio
from . import algorithms


__version__ = '0.3-git'