You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/06/17 19:30:19 UTC
[incubator-dlab] branch DLAB-1855 created (now c881a67)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1855
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at c881a67 [DLAB-1855]: changed pip2 installation
This branch includes the following new commits:
new 6662b81 [DLAB-1855]: changed pip install
new c881a67 [DLAB-1855]: changed pip2 installation
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1855]: changed pip install
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1855
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6662b81360071bd24e986592b5f34de7f14a3c38
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Jun 17 22:07:24 2020 +0300
[DLAB-1855]: changed pip install
---
infrastructure-provisioning/src/general/lib/os/fab.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index 0f75b5e..7d2f396 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -57,7 +57,7 @@ def install_pip_pkg(requisites, pip_version, lib_group):
error_parser = "Could not|No matching|ImportError:|failed|EnvironmentError:"
try:
if pip_version == 'pip3' and not exists('/bin/pip3'):
- sudo('ln -s /bin/pip3.6 /bin/pip3')
+ sudo('ln -s /bin/pip3.7 /bin/pip3')
sudo('{} install -U pip=={} setuptools'.format(pip_version, os.environ['conf_pip_version']))
sudo('{} install -U pip=={} --no-cache-dir'.format(pip_version, os.environ['conf_pip_version']))
sudo('{} install --upgrade pip=={}'.format(pip_version, os.environ['conf_pip_version']))
@@ -645,7 +645,8 @@ def configure_data_engine_service_pip(hostname, os_user, keyfile):
env.key_filename = [keyfile]
env.host_string = os_user + '@' + hostname
if not exists('/usr/bin/pip2'):
- sudo('ln -s /usr/bin/pip-2.7 /usr/bin/pip2')
+ manage_pkg('-y install', 'remote', 'python2-pip')
+ #sudo('ln -s /usr/bin/pip-2.7 /usr/bin/pip2')
if not exists('/usr/bin/pip3') and sudo("python3.4 -V 2>/dev/null | awk '{print $2}'"):
manage_pkg('-y install', 'remote', 'python3-pip')
sudo('ln -s /usr/bin/pip-3.4 /usr/bin/pip3')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1855]: changed pip2 installation
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1855
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c881a6789ef9f2151edde701ad4eae44fab4e517
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Jun 17 22:29:39 2020 +0300
[DLAB-1855]: changed pip2 installation
---
infrastructure-provisioning/src/general/lib/os/fab.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index 7d2f396..1e68e3f 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -645,8 +645,10 @@ def configure_data_engine_service_pip(hostname, os_user, keyfile):
env.key_filename = [keyfile]
env.host_string = os_user + '@' + hostname
if not exists('/usr/bin/pip2'):
- manage_pkg('-y install', 'remote', 'python2-pip')
- #sudo('ln -s /usr/bin/pip-2.7 /usr/bin/pip2')
+ if not exists('/usr/bin/pip-2.7'):
+ manage_pkg('-y install', 'remote', 'python2-pip')
+ else:
+ sudo('ln -s /usr/bin/pip-2.7 /usr/bin/pip2')
if not exists('/usr/bin/pip3') and sudo("python3.4 -V 2>/dev/null | awk '{print $2}'"):
manage_pkg('-y install', 'remote', 'python3-pip')
sudo('ln -s /usr/bin/pip-3.4 /usr/bin/pip3')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org