openstack/devstack
Code Issues Proposed changes

Update projects to global requirements before setup

Browse Source 
We've agreed that we should be using global requirements, so
force projects to be updated to global requirements before we
test them.

Co-Authored-With: Monty Taylor <mordred@inaugust.com>

Change-Id: I0652f639673e600fd7508a9869ec85f8d5ce4518
This commit is contained in:
Sean Dague 2013-07-31 06:50:14 -04:00
parent f3d5045ebd
commit 6c84463071
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
functions
View File

@ -1131,18 +1131,32 @@ function service_check() {
# Uses globals ``STACK_USER``, ``TRACK_DEPENDES``, ``*_proxy` # Uses globals ``STACK_USER``, ``TRACK_DEPENDES``, ``*_proxy`
# setup_develop directory # setup_develop directory
function setup_develop() { function setup_develop() {
local project_dir=$1
if [[ $TRACK_DEPENDS = True ]]; then if [[ $TRACK_DEPENDS = True ]]; then
SUDO_CMD="env" SUDO_CMD="env"
else else
SUDO_CMD="sudo" SUDO_CMD="sudo"
fi fi
$SUDO_CMD \
HTTP_PROXY=$http_proxy \ echo "cd $REQUIREMENTS_DIR; $SUDO_CMD python update.py $project_dir"
HTTPS_PROXY=$https_proxy \
NO_PROXY=$no_proxy \ (cd $REQUIREMENTS_DIR; \
pip install -e $1 $SUDO_CMD python update.py $project_dir)
# ensure that further actions can do things like setup.py sdist
$SUDO_CMD chown -R $STACK_USER $1/*.egg-info for reqs_file in $project_dir/requirements.txt $project_dir/tools/pip-requires ; do
if [ -f $reqs_file ] ; then
pip_install -r $reqs_file
fi
done
(cd $project_dir; \
python setup.py egg_info; \
$SUDO_CMD \
HTTP_PROXY=$http_proxy \
HTTPS_PROXY=$https_proxy \
NO_PROXY=$no_proxy \
python setup.py develop \
)
} }

2
stack.sh
View File

@ -647,7 +647,7 @@ TRACK_DEPENDS=${TRACK_DEPENDS:-False}
# 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"
install_package python-virtualenv pip_install -U virtualenv
rm -rf $DEST/.venv rm -rf $DEST/.venv
virtualenv --system-site-packages $DEST/.venv virtualenv --system-site-packages $DEST/.venv