Merge branch 'state_space' into devel

This commit is contained in:
mzwiessele 2016-04-14 07:43:03 +01:00
commit a7645105e4

View file

@ -47,9 +47,11 @@ before_deploy:
- make html
- cd ../
- if [[ "$TRAVIS_OS_NAME" == "linux" ]];
then export DIST='sdist';
then
export DIST='sdist';
elif [[ "$TRAVIS_OS_NAME" == "osx" ]];
then export DIST='bdist_wheel';
then
export DIST='bdist_wheel';
fi;
deploy:
@ -60,5 +62,6 @@ deploy:
on:
tags: true
branch: deploy
condition: "$TRAVIS_OS_NAME" == "osx" || ( "$TRAVIS_OS_NAME" == "linux" && "$PYTHON_VERSION" == "2.7" )
distributions: $DIST
skip_cleanup: true