openstack/devstack
Code Issues Proposed changes

Merge "Re-enble pip -e in setup_develop"

Browse Source
This commit is contained in:
Jenkins
2013-08-06 15:56:28 +00:00
committed by Gerrit Code Review
parent 48e4a2b9f2 b5bbaac09a
commit 1b11fa58f5
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
functions
View File

@@ -1128,7 +1128,7 @@ function service_check() {
# ``pip install -e`` the package, which processes the dependencies # ``pip install -e`` the package, which processes the dependencies
# using pip before running `setup.py develop` # using pip before running `setup.py develop`
# Uses globals ``STACK_USER``, ``TRACK_DEPENDES``, ``*_proxy` # Uses globals ``STACK_USER``, ``TRACK_DEPENDS``, ``REQUIREMENTS_DIR``
# setup_develop directory # setup_develop directory
function setup_develop() { function setup_develop() {
local project_dir=$1 local project_dir=$1
@@ -1143,20 +1143,9 @@ function setup_develop() {
(cd $REQUIREMENTS_DIR; \ (cd $REQUIREMENTS_DIR; \
$SUDO_CMD python update.py $project_dir) $SUDO_CMD python update.py $project_dir)
for reqs_file in $project_dir/requirements.txt $project_dir/tools/pip-requires ; do pip_install -e $project_dir
if [ -f $reqs_file ] ; then # ensure that further actions can do things like setup.py sdist
pip_install -r $reqs_file $SUDO_CMD chown -R $STACK_USER $1/*.egg-info
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 \
)
} }