We had a bad merge somewhere along the way which reverted the pip -e
part of things. Replace it.
Change-Id: I620bea80eac7ad53b5bfb79dd2b21c29ad1b2267
| ... | ... |
@@ -1128,7 +1128,7 @@ function service_check() {
|
| 1128 | 1128 |
|
| 1129 | 1129 |
# ``pip install -e`` the package, which processes the dependencies |
| 1130 | 1130 |
# using pip before running `setup.py develop` |
| 1131 |
-# Uses globals ``STACK_USER``, ``TRACK_DEPENDES``, ``*_proxy` |
|
| 1131 |
+# Uses globals ``STACK_USER``, ``TRACK_DEPENDS``, ``REQUIREMENTS_DIR`` |
|
| 1132 | 1132 |
# setup_develop directory |
| 1133 | 1133 |
function setup_develop() {
|
| 1134 | 1134 |
local project_dir=$1 |
| ... | ... |
@@ -1143,20 +1143,9 @@ function setup_develop() {
|
| 1143 | 1143 |
(cd $REQUIREMENTS_DIR; \ |
| 1144 | 1144 |
$SUDO_CMD python update.py $project_dir) |
| 1145 | 1145 |
|
| 1146 |
- for reqs_file in $project_dir/requirements.txt $project_dir/tools/pip-requires ; do |
|
| 1147 |
- if [ -f $reqs_file ] ; then |
|
| 1148 |
- pip_install -r $reqs_file |
|
| 1149 |
- fi |
|
| 1150 |
- done |
|
| 1151 |
- |
|
| 1152 |
- (cd $project_dir; \ |
|
| 1153 |
- python setup.py egg_info; \ |
|
| 1154 |
- $SUDO_CMD \ |
|
| 1155 |
- HTTP_PROXY=$http_proxy \ |
|
| 1156 |
- HTTPS_PROXY=$https_proxy \ |
|
| 1157 |
- NO_PROXY=$no_proxy \ |
|
| 1158 |
- python setup.py develop \ |
|
| 1159 |
- ) |
|
| 1146 |
+ pip_install -e $project_dir |
|
| 1147 |
+ # ensure that further actions can do things like setup.py sdist |
|
| 1148 |
+ $SUDO_CMD chown -R $STACK_USER $1/*.egg-info |
|
| 1160 | 1149 |
} |
| 1161 | 1150 |
|
| 1162 | 1151 |
|