Use twine for release process (#535)

Author: robsdedude

bin/check-dist

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 ROOT=$(dirname "$0")/..
 SCRIPT=$(basename "$0")

bin/dist-functions

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 ROOT=$(dirname "$0")/..
 DIST="${ROOT}/dist"
@@ -52,6 +53,18 @@ function set_metadata_and_setup
     grep "version\s\+=" neo4j/meta.py
     echo "----------------------------------------"
 
+    function cleanup() {
+      # Reset to original package metadata
+      set_package "${ORIGINAL_PACKAGE}"
+      set_version "${ORIGINAL_VERSION}"
+      echo "Source code reconfigured back to original package ${ORIGINAL_PACKAGE}/${ORIGINAL_VERSION}"
+      echo "----------------------------------------"
+      grep "package\s\+=" neo4j/meta.py
+      grep "version\s\+=" neo4j/meta.py
+      echo "----------------------------------------"
+    }
+    trap cleanup EXIT
+
     # Temporarily override package metadata
     set_package "${PACKAGE}"
     set_version "${VERSION}"
@@ -67,15 +80,8 @@ function set_metadata_and_setup
     python setup.py $*
     check_file "${DIST}/${PACKAGE}-${VERSION}.tar.gz"
 
-    # Reset to original package metadata
-    set_package "${ORIGINAL_PACKAGE}"
-    set_version "${ORIGINAL_VERSION}"
-    echo "Source code reconfigured back to original package ${ORIGINAL_PACKAGE}/${ORIGINAL_VERSION}"
-    echo "----------------------------------------"
-    grep "package\s\+=" neo4j/meta.py
-    grep "version\s\+=" neo4j/meta.py
-    echo "----------------------------------------"
-
+  trap - EXIT
+  cleanup
 }
 
 function setup

bin/make-dist

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 ROOT=$(dirname "$0")/..
 SCRIPT=$(basename "$0")

bin/make-docs

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 ROOT=$(dirname "$0")/..
 

bin/make-pypirc

@@ -1,7 +1,16 @@
 #!/usr/bin/env bash
+set -e
 
 ROOT=$(dirname "$0")/..
 SCRIPT=$(basename "$0")
+TWINE_ARGS="--verbose"
+
+if [ "$1" == "--real" ]
+then
+    shift
+else
+    TWINE_ARGS="${TWINE_ARGS} --repository testpypi"
+fi
 
 VERSION="$1"
 if [ "${VERSION}" == "" ]
@@ -10,5 +19,7 @@ then
     exit 1
 else
     source "${ROOT}/bin/dist-functions"
-    setup "${VERSION}" sdist upload -r pypi --show-response
+    twine upload ${TWINE_ARGS} \
+        "${DIST}/neo4j-driver-${VERSION}.tar.gz" \
+        "${DIST}/neo4j-${VERSION}.tar.gz"
 fi