From fce1f19ed95e897f82783a22e30e170cf2572772 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Thu, 23 Jul 2015 17:49:57 -0700 Subject: [PATCH] Do not call update.py from a venv 198580 backported a change to install requirements into a venv and call update.py from that venv. stable/juno's pip facilities do not contain the venv support. openstack-requirements ends up installed into the system but we're calling update.py from a bare venv. This prevents 198146 from merging, which is blocking stable/juno merges and client releases. Rather than backport all of the venv support into stable/juno this late in its life, this just removes the venv assumption and relies on requirements ending up installed system-wide like it is now. Change-Id: I11c9583be5d71a0d4797ea6ff25c245f1aadf0a5 --- functions-common | 2 +- lib/infra | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/functions-common b/functions-common index 68faf9853b..7d2138dc31 100644 --- a/functions-common +++ b/functions-common @@ -1666,7 +1666,7 @@ function setup_package_with_req_sync { if [[ $update_requirements != "changed" ]]; then (cd $REQUIREMENTS_DIR; \ - ./.venv/bin/python update.py $project_dir) + python update.py $project_dir) fi setup_package $project_dir $flags diff --git a/lib/infra b/lib/infra index 503cc46ead..ef5a136b83 100644 --- a/lib/infra +++ b/lib/infra @@ -30,14 +30,7 @@ function install_infra { local PIP_VIRTUAL_ENV="$REQUIREMENTS_DIR/.venv" # bring down global requirements git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH - [ ! -d $PIP_VIRTUAL_ENV ] && virtualenv $PIP_VIRTUAL_ENV - # We don't care about testing git pbr in the requirements venv. - PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr - PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install $REQUIREMENTS_DIR - - # Unset the PIP_VIRTUAL_ENV so that PBR does not end up trapped - # down the VENV well - unset PIP_VIRTUAL_ENV + pip_install $REQUIREMENTS_DIR # Install pbr if use_library_from_git "pbr"; then