Fix deploy conditions

diff --git a/.travis.yml b/.travis.yml
index 45aa92d0e312e54ee7608cf734b8d84109e16897..e501331867f444fddccf002f76604d26dc686795 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,10 +35,15 @@ deploy:
     skip_upload_docs: true
     on:
       tags: true
+      branch: master
+      condition: $TRAVIS_PYTHON_VERSION = "3.5"
   - provider: pypi
-    server: https://testpypi.python.org
+    server: https://testpypi.python.org/pypi
     user: noahmorrison
     password:
       secure: GK+PXWWCczHMQAptgAA6umma0kP+fPsCktHzDnpb4Pa7RZBjxjS1mbRtwSfMm8gWcRYkqjO0la/t3TUP3qjfa+x5JmIwy2YTveBKmSjTxLAb9n7fCWZEGu9GWgGvfsmg2Hhi6NYUp9U7ggtoBXQ4AHgmnPyDCL2TQK32PKj5soM=
     distributions: sdist bdist_wheel
-    skip_upload_docs: true
\ No newline at end of file
+    skip_upload_docs: true
+    on:
+      all_branches: true
+      condition: $TRAVIS_PYTHON_VERSION = "3.5"
\ No newline at end of file