openstack/devstack
Code Issues Proposed changes

Merge "Clone reqs repo prior to using pip constraints"

Browse Source
This commit is contained in:
Jenkins 2015-08-18 19:43:12 +00:00 committed by Gerrit Code Review
commit dedde0984c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/infra
View File

@ -30,8 +30,6 @@ REQUIREMENTS_DIR=$DEST/requirements
# install_infra() - Collect source and prepare # install_infra() - Collect source and prepare
function install_infra { function install_infra {
local PIP_VIRTUAL_ENV="$REQUIREMENTS_DIR/.venv" 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 [ ! -d $PIP_VIRTUAL_ENV ] && virtualenv $PIP_VIRTUAL_ENV
# We don't care about testing git pbr in the requirements venv. # 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 -U pbr

5
stack.sh
View File

@ -698,6 +698,11 @@ fi
TRACK_DEPENDS=${TRACK_DEPENDS:-False} TRACK_DEPENDS=${TRACK_DEPENDS:-False}
# Bring down global requirements before any use of pip_install. This is
# necessary to ensure that the constraints file is in place before we
# attempt to apply any constraints to pip installs.
git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH
# Install Python packages into a virtualenv so that we can track them # Install Python packages into a virtualenv so that we can track them
if [[ $TRACK_DEPENDS = True ]]; then if [[ $TRACK_DEPENDS = True ]]; then
echo_summary "Installing Python packages into a virtualenv $DEST/.venv" echo_summary "Installing Python packages into a virtualenv $DEST/.venv"