try some more deployment stuff

.travis.yml

@@ -17,12 +17,12 @@ script: python -m pytest --cov=user_config --cov-report xml -v
 after_script: python-codacy-coverage -r coverage.xml
 deploy:
 - provider: script
-  script: TWINE_REPOSITORY_URL=https://testpypi.python.org/pypi sh scripts/pypi_deploy.sh
+  script: TWINE_REPOSITORY=testpypi sh scripts/pypi_deploy.sh
   on:
     condition: $TRAVIS_PYTHON_VERSION = "3.6"
   skip_cleanup: true
 - provider: script
-  script: TWINE_REPOSITORY_URL=https://upload.pypi.org/legacy/ sh scripts/pypi_deploy.sh
+  script: TWINE_REPOSITORY=pypi sh scripts/pypi_deploy.sh
   on:
     tags: true
     condition: $TRAVIS_PYTHON_VERSION = "3.6"

scripts/pypi_deploy.sh

@@ -2,21 +2,15 @@
 set -e
 set +x # double-check that x is unset
 python setup.py sdist bdist_wheel --universal
-touch ~/.pypirc
-#cat > .pypirc << EOF
-#[distutils]
-#index-servers=
-#    pypi
-#    testpypi
-#
-#[server-login]
-#username = nihlaeth
-#password = ${PYPI_PASSWORD}
-#
-#[testpypi]
-#repository = https://testpypi.python.org/pypi
-#
-#[pypi]
-#repository = https://upload.pypi.org/legacy/
-#EOF
-twine upload dist/*
+cat > ~/.pypirc << _EOF_
+[testpypi]
+repository = https://testpypi.python.org/pypi
+username = ${TWINE_USERNAME}
+password = ${TWINE_PASSWORD}
+
+[pypi]
+repository = https://upload.pypi.org/legacy/
+username = ${TWINE_USERNAME}
+password = ${TWINE_PASSWORD}
+_EOF_
+twine upload -r ${TWINE_REPOSITORY} dist/*