From: Tom Clegg <tom@curoverse.com>
Date: Sat, 7 Feb 2015 09:56:15 +0000 (-0500)
Subject: Use virtualenv to get a newer setuptools that doesn't munge Python versions. No issue #
X-Git-Tag: 1.1.0~1059^2~6^2~207
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/11339c91b5e7efdc214897856b103d0c532df45e

Use virtualenv to get a newer setuptools that doesn't munge Python versions. No issue #
---

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 1dae4bcd78..cdf1d17a25 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -85,6 +85,14 @@ if [[ "$DEBUG" != 0 ]]; then
   echo "Workspace is $WORKSPACE"
 fi
 
+# We need a recent setuptools. Older ones replace + with - in our
+# version numbers, making them non-PEP-440-compliant and
+# non-uploadable.
+VENV=$(mktemp -d)
+echo "Using virtualenv $VENV"
+virtualenv "$VENV"
+. "$VENV/bin/activate"
+
 version_from_git() {
   # Generates a version number from the git log for the current working
   # directory, and writes it to stdout.
@@ -477,7 +485,8 @@ else
   fi
 fi
 
-# clean up temporary GOPATH
+# clean up temporary GOPATH and VENV
 rm -rf "$GOPATH"
+rm -rf "$VENV"
 
 exit $EXITCODE