Browse code
Actually install the requirements repo.
The requirements repo has had a setup.cfg etc for a long time but only
recently started using it. As it now has dependencies, we need to pip
install it. To preserve compat with older requirements repos I haven't
changed the call to invoke update-requirements yet, as we still have
the update.py symlink.
The pbr install is moved before requirements to ensure we don't
trigger easy-install.
Change-Id: I7d7e91694c9145fac0ddab8a9de5f789d723c641
Robert Collins authored on 2015/06/17 10:52:20Showing 1 changed files
| ... | ... |
@@ -29,9 +29,6 @@ REQUIREMENTS_DIR=$DEST/requirements |
| 29 | 29 |
|
| 30 | 30 |
# install_infra() - Collect source and prepare |
| 31 | 31 |
function install_infra {
|
| 32 |
- # bring down global requirements |
|
| 33 |
- git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH |
|
| 34 |
- |
|
| 35 | 32 |
# Install pbr |
| 36 | 33 |
if use_library_from_git "pbr"; then |
| 37 | 34 |
git_clone_by_name "pbr" |
| ... | ... |
@@ -41,6 +38,10 @@ function install_infra {
|
| 41 | 41 |
# in via system packages. |
| 42 | 42 |
pip_install "-U" "pbr" |
| 43 | 43 |
fi |
| 44 |
+ |
|
| 45 |
+ # bring down global requirements |
|
| 46 |
+ git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH |
|
| 47 |
+ pip_install $REQUIREMENTS_DIR |
|
| 44 | 48 |
} |
| 45 | 49 |
|
| 46 | 50 |
# Restore xtrace |