apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-07-20 16:51:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' of github.com:SheffieldML/GPy into devel

Browse source
This commit is contained in:
Max Zwiessele 2016-04-14 08:49:23 +01:00
commit bffcd916fb
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

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

3
setup.cfg
View file

@ -11,3 +11,6 @@ universal = 1
[upload_docs] [upload_docs]
upload-dir = doc/build/html upload-dir = doc/build/html
[medatdata]
description-file = README.rst