Browse code

Merge "Clone reqs repo prior to using pip constraints"

Jenkins authored on 2015/08/19 04:43:12
Showing 2 changed files
... ...
@@ -30,8 +30,6 @@ REQUIREMENTS_DIR=$DEST/requirements
30 30
 # install_infra() - Collect source and prepare
31 31
 function install_infra {
32 32
     local PIP_VIRTUAL_ENV="$REQUIREMENTS_DIR/.venv"
33
-    # bring down global requirements
34
-    git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH
35 33
     [ ! -d $PIP_VIRTUAL_ENV ] && virtualenv $PIP_VIRTUAL_ENV
36 34
     # We don't care about testing git pbr in the requirements venv.
37 35
     PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr
... ...
@@ -698,6 +698,11 @@ fi
698 698
 
699 699
 TRACK_DEPENDS=${TRACK_DEPENDS:-False}
700 700
 
701
+# Bring down global requirements before any use of pip_install. This is
702
+# necessary to ensure that the constraints file is in place before we
703
+# attempt to apply any constraints to pip installs.
704
+git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH
705
+
701 706
 # Install Python packages into a virtualenv so that we can track them
702 707
 if [[ $TRACK_DEPENDS = True ]]; then
703 708
     echo_summary "Installing Python packages into a virtualenv $DEST/.venv"