summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Powers <dana.powers@gmail.com>2016-03-14 20:57:50 -0700
committerDana Powers <dana.powers@gmail.com>2016-03-14 20:57:50 -0700
commitd3743a0cddb2b4fe4d25bee9bd9dce91665e08b2 (patch)
treeb1c76b48a2dfe19b771be6a891396053d5878305
parent584e5ec740de4cb99b6e0437375d4eccb6e93ca9 (diff)
parente7547db049709a44a0aed9200a3dca43331511dc (diff)
downloadkafka-python-d3743a0cddb2b4fe4d25bee9bd9dce91665e08b2.tar.gz
Merge pull request #599 from zackdever/travis-master-deploy
Only deploy master branch now that travis bug is fixed.
-rw-r--r--.travis.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 60f0ca2..8bd1fcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,9 +41,7 @@ deploy:
secure: TIZNKxktOm42/LHLDCuKuPqmAfYKekyHL4MqEFpnqDI5T5sHzG9IQaOwppYfQNggHiILUBzk1j6w/FPJunJyd62AFtydkKtIccqENIIAio78afeCRMQDynstNXjDefmt0s90xLGSlLzDMxCEWB4F6frEtPl/8KpNSFB2fvj+HXY=
on:
tags: true
- all_branches: true
- # TODO replace all_branches with "branch: master" after https://github.com/travis-ci/travis-ci/issues/1675 is fixed
- # branch: master
+ branch: master
script:
- tox -e `if [ "$TRAVIS_PYTHON_VERSION" == "pypy" ]; then echo pypy; else echo py${TRAVIS_PYTHON_VERSION/./}; fi`