Rather than parsing then feeding the pip requirements file to pip,
just have pip consume it directly.
Change-Id: I17bbe4324e6957c7165bc0f340ddae1e51039471
| ... | ... |
@@ -1087,12 +1087,13 @@ function setup_develop() {
|
| 1087 | 1087 |
else |
| 1088 | 1088 |
SUDO_CMD="sudo" |
| 1089 | 1089 |
fi |
| 1090 |
+ for reqs_file in $1/requirements.txt $1/tools/pip-requires ; do |
|
| 1091 |
+ if [ -f $reqs_file ] ; then |
|
| 1092 |
+ pip_install -r $reqs_file |
|
| 1093 |
+ fi |
|
| 1094 |
+ done |
|
| 1090 | 1095 |
(cd $1; \ |
| 1091 | 1096 |
python setup.py egg_info; \ |
| 1092 |
- raw_links=$(awk '/^.+/ {print "-f " $1}' *.egg-info/dependency_links.txt); \
|
|
| 1093 |
- depend_links=$(echo $raw_links | xargs); \ |
|
| 1094 |
- require_file=$([ ! -r *-info/requires.txt ] || echo "-r *-info/requires.txt"); \ |
|
| 1095 |
- pip_install $require_file $depend_links; \ |
|
| 1096 | 1097 |
$SUDO_CMD \ |
| 1097 | 1098 |
HTTP_PROXY=$http_proxy \ |
| 1098 | 1099 |
HTTPS_PROXY=$https_proxy \ |