handle all deploy logic in bash file

.travis.yml

@@ -18,19 +18,7 @@ after_success:
 - echo $PATH
 - which bash
 - which python
-- HOME=$TRAVIS_BUILD_DIR TWINE_REPOSITORY=testpypi sh ./scripts/pypi_deploy.sh
-deploy:
-- provider: script
-  script: "HOME=$TRAVIS_BUILD_DIR TWINE_REPOSITORY=testpypi sh ./scripts/pypi_deploy.sh"
-  on:
-    condition: $TRAVIS_PYTHON_VERSION = "3.6"
-  skip_cleanup: true
-- provider: script
-  script: "HOME=$TRAVIS_BUILD_DIR TWINE_REPOSITORY=pypi sh ./scripts/pypi_deploy.sh"
-  on:
-    tags: true
-    condition: $TRAVIS_PYTHON_VERSION = "3.6"
-  skip_cleanup: true
+- test "${TRAVIS_PULL_REQUEST}" == "false" && sh ./scripts/pypi_deploy.sh
 env:
   global:
   - TWINE_USERNAME=nihlaeth

scripts/pypi_deploy.sh

@@ -1,10 +1,7 @@
 #!/bin/bash
 set -ev
-echo "check #1"
-set +x # double-check that x is unset
-echo "check #2"
+# set +x # double-check that x is unset
 $(which python) setup.py sdist bdist_wheel --universal
-echo "check #3"
 cat > ~/.pypirc << _EOF_
 [distutils]
 index-servers=
@@ -21,11 +18,9 @@ repository = https://upload.pypi.org/legacy/
 username = ${TWINE_USERNAME}
 password = ${TWINE_PASSWORD}
 _EOF_
-echo "check #4"
 if [ "${TRAVIS_PYTHON_VERSION}" = "3.6" ]; then
-    $(which twine) upload -r ${TWINE_REPOSITORY} dist/*
+    $(which twine) upload -r testpypi --skip-existing dist/*
+    if [ "${TRAVIS_TAG}" != "" ]; then
+        $(which twine) upload -r pypi --skip-existing dist/*
+    fi
 fi
-
-# reset ownership so that we can stop using sudo
-# sudo chown --changes --recursive $(whoami):$(id --group $(whoami)) .
-# sudo chown --changes $(whoami):$(id --group $(whoami)) ~/.pypirc