[mesos] branch master updated: Updated bootstrap in new CLI to honor relative path in pip requirements.

[kl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

klueska pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new 2cd0157  Updated bootstrap in new CLI to honor relative path in pip requirements.
2cd0157 is described below

commit 2cd01571f847ce34aa38067dbc5fcdda9a6cc68c
Author: Kevin Klues <kl...@gmail.com>
AuthorDate: Thu Oct 18 11:39:42 2018 -0400

    Updated bootstrap in new CLI to honor relative path in pip requirements.
    
    Previously, bootstrap would fail if there was a relative path in
    pip-requirements.txt, but bootstrap was run from a different directory
    than where pip-requirements.txt was located.
    
    We fix this now by 'cding' into the directory where the bootstrap file
    (and the pip-requirements.tx file) are located before pip installing.
---
 src/python/cli_new/bootstrap | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/python/cli_new/bootstrap b/src/python/cli_new/bootstrap
index 38683a5..458f7c4 100755
--- a/src/python/cli_new/bootstrap
+++ b/src/python/cli_new/bootstrap
@@ -51,8 +51,10 @@ SITE_PACKAGES=$(python -c "from distutils.sysconfig import get_python_lib; print
 echo ${SITE_PACKAGES}
 echo "${CURRDIR}/lib" > ${SITE_PACKAGES}/_virtualenv_path_extensions.pth
 python -m pip install --upgrade pip
-python -m pip install -r ${CURRDIR}/pip-requirements.txt
-python -m pip install -r ${CURRDIR}/../lib/requirements.in
+cd ${CURRDIR}
+python -m pip install -r pip-requirements.txt
+python -m pip install -r ../lib/requirements.in
+cd -
 deactivate
 
 # Add custom postactivate / predeactivate scripts to add / remove