[ARVADOS-DEV] updated: f3e822f9fe498c6c9ef5fc0602b98695349e6e5e

git at public.curoverse.com git at public.curoverse.com
Mon Feb 9 17:38:29 EST 2015


Summary of changes:
 jenkins/run-build-packages.sh | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

       via  f3e822f9fe498c6c9ef5fc0602b98695349e6e5e (commit)
      from  11339c91b5e7efdc214897856b103d0c532df45e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f3e822f9fe498c6c9ef5fc0602b98695349e6e5e
Author: Brett Smith <brettcsmith at brettcsmith.org>
Date:   Mon Feb 9 17:38:02 2015 -0500

    Revert 11339c91. Don't use virtualenv to build packages.
    
    fpm and virtualenv don't play nicely together.  Under virtualenv, fpm
    ends up building Python packages that include the files under their
    virtualenv paths.  This is not what we want.  Refs #5175.

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index cdf1d17..1dae4bc 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -85,14 +85,6 @@ 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.
@@ -485,8 +477,7 @@ else
   fi
 fi
 
-# clean up temporary GOPATH and VENV
+# clean up temporary GOPATH
 rm -rf "$GOPATH"
-rm -rf "$VENV"
 
 exit $EXITCODE

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list