Merge pull request dpkp#599 from zackdever/travis-master-deploy

dpkp · dpkp · commit d3743a0cddb2 · 2016-03-14T20:57:50.000-07:00
Only deploy master branch now that travis bug is fixed.
diff --git 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`
