mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From klue...@apache.org
Subject [mesos] branch master updated: Moved import of '../lib' from new CLI bootstrap to pip-requirements.txt.
Date Tue, 16 Oct 2018 12:01:38 GMT
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 6f87faf  Moved import of '../lib' from new CLI bootstrap to pip-requirements.txt.
6f87faf is described below

commit 6f87faf6d2902351ef637caa9e56c8d33f204f7e
Author: Armand Grillet <agrillet@mesosphere.io>
AuthorDate: Tue Oct 16 07:51:51 2018 -0400

    Moved import of '../lib' from new CLI bootstrap to pip-requirements.txt.
    
    Previously, we were adding the path to this module when setting up the
    CLI virtual environment in the bootstrap file. However, we should have
    always been pulling it from 'pip-requirements.txt' in order to remain
    consistent. We didn't run into any issues with this before, because this
    library was unused until now.
    
    Review: https://reviews.apache.org/r/68971/
---
 src/python/cli_new/bootstrap            | 1 -
 src/python/cli_new/pip-requirements.txt | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/python/cli_new/bootstrap b/src/python/cli_new/bootstrap
index a6183d4..38683a5 100755
--- a/src/python/cli_new/bootstrap
+++ b/src/python/cli_new/bootstrap
@@ -50,7 +50,6 @@ source ${VIRTUALENV_DIRECTORY}/bin/activate
 SITE_PACKAGES=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
 echo ${SITE_PACKAGES}
 echo "${CURRDIR}/lib" > ${SITE_PACKAGES}/_virtualenv_path_extensions.pth
-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
diff --git a/src/python/cli_new/pip-requirements.txt b/src/python/cli_new/pip-requirements.txt
index d1822bf..dfbc28f 100644
--- a/src/python/cli_new/pip-requirements.txt
+++ b/src/python/cli_new/pip-requirements.txt
@@ -13,3 +13,5 @@ six==1.10.0
 termcolor==1.1.0
 toml==0.9.2
 wrapt==1.10.8
+
+-e ../lib


Mime
View raw message