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/07/09 07:51:08 UTC
[incubator-dlab] branch DLAB-1748 updated (03f6e24 -> a4895c1)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 03f6e24 [DLAB-1748]: added installation of specific pip lib and list of versions and dependencies to response file
new 246b2e6 [DLAB-1748]: added installation of specific pip lib and list of versions and dependencies to response file for other group
new b7afe51 [DLAB-1748]: added installation of specific pip lib and list of versions and dependencies to response file for other group
new d0899c4 [DLAB-1748]: made dependencies a list
new a4895c1 [DLAB-1748]: made dependencies equal 'none' if there are no dependencies for pip
The 4 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.
Summary of changes:
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/fab.py | 4 +++-
.../src/general/scripts/os/install_additional_libs.py | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/04: [DLAB-1748]: added installation of specific
pip lib and list of versions and dependencies to response file for other
group
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 246b2e6a5f6ffb38ef7d42d002fdebaf4b73cd10
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Jul 8 19:24:36 2020 +0300
[DLAB-1748]: added installation of specific pip lib and list of versions and dependencies to response file for other group
---
.../src/general/scripts/os/install_additional_libs.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py b/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
index 84db583..6abaa73 100644
--- a/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
@@ -58,7 +58,7 @@ if __name__ == "__main__":
pkgs['libraries'][data[row]['group']].append(
[data[row]['name'].split(':')[0], data[row]['name'].split(':')[1],
data[row]['version'], data[row]['override']])
- elif data[row]['group'] == "pip2" or data[row]['group'] == "pip3" or data[row]['group'] == "os_pkg":
+ elif data[row]['group'] == "pip2" or data[row]['group'] == "pip3" or data[row]['group'] == "os_pkg" or data[row]['group'] == "other":
pkgs['libraries'][data[row]['group']].append(
[data[row]['name'], data[row]['version']])
else:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/04: [DLAB-1748]: made dependencies equal 'none'
if there are no dependencies for pip
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a4895c156c48178ffc01d3422904824369c5bf6b
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Jul 9 10:50:01 2020 +0300
[DLAB-1748]: made dependencies equal 'none' if there are no dependencies for pip
---
infrastructure-provisioning/src/general/lib/os/fab.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index 1020133..9e58946 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -96,6 +96,8 @@ def install_pip_pkg(requisites, pip_version, lib_group):
'==')[1]
dep = sudo('{0} show {1} 2>&1 | grep "Requires: "'.format(pip_version, pip_pkg.split("=")[0])).replace(
'\r', '').replace('\n', '').replace('Requires: ', '').strip().split(' ')
+ if dep == '':
+ dep = "none"
status.append({"group": "{}".format(lib_group), "name": pip_pkg.split("=")[0], "version": version, "status": "installed", "add_pkgs": dep})
else:
status.append({"group": "{}".format(lib_group), "name": pip_pkg.split("=")[0], "status": "failed", "error_message": err})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/04: [DLAB-1748]: made dependencies a list
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d0899c4d965a5e7d5850fdaac5a19cc523332073
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Jul 9 10:04:54 2020 +0300
[DLAB-1748]: made dependencies a list
---
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/fab.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index 9558c7c..4d905e6 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -382,7 +382,7 @@ def install_os_pkg(requisites):
'/tmp/os_install_{0}_dep.log; then echo "" > /tmp/os_install_{0}_dep.log;fi'.format(os_pkg, add_pkgs_parser))
err = sudo('cat /tmp/os_install_{}_err.log'.format(os_pkg)).replace('"', "'")
dep = sudo('cat /tmp/os_install_{}_dep.log'.format(os_pkg))
- dep = dep[len(add_pkgs_parser):dep.find("Suggested packages:")].replace('\r', '').replace('\n', '').replace(' ', ' ').strip()
+ dep = dep[len(add_pkgs_parser):dep.find("Suggested packages:")].replace('\r', '').replace('\n', '').replace(' ', ' ').strip().split(' ')
if dep == '':
dep = "none"
sudo('apt list --installed | if ! grep {0}/ > /tmp/os_install_{1}.list; then echo "" > /tmp/os_install_{1}.list;fi'.format(os_pkg.split("=")[0], os_pkg))
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index b800448..1020133 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -95,7 +95,7 @@ def install_pip_pkg(requisites, pip_version, lib_group):
[i for i in ver if pip_pkg.split("=")[0].lower() in i][0].split(
'==')[1]
dep = sudo('{0} show {1} 2>&1 | grep "Requires: "'.format(pip_version, pip_pkg.split("=")[0])).replace(
- '\r', '').replace('\n', '').replace('Requires: ', '').strip()
+ '\r', '').replace('\n', '').replace('Requires: ', '').strip().split(' ')
status.append({"group": "{}".format(lib_group), "name": pip_pkg.split("=")[0], "version": version, "status": "installed", "add_pkgs": dep})
else:
status.append({"group": "{}".format(lib_group), "name": pip_pkg.split("=")[0], "status": "failed", "error_message": err})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/04: [DLAB-1748]: added installation of specific
pip lib and list of versions and dependencies to response file for other
group
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b7afe5133d9199527220fb8ae55d4e227088b528
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Jul 8 19:28:37 2020 +0300
[DLAB-1748]: added installation of specific pip lib and list of versions and dependencies to response file for other group
---
.../src/general/scripts/os/install_additional_libs.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py b/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
index 6abaa73..e91ae0b 100644
--- a/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
@@ -58,7 +58,7 @@ if __name__ == "__main__":
pkgs['libraries'][data[row]['group']].append(
[data[row]['name'].split(':')[0], data[row]['name'].split(':')[1],
data[row]['version'], data[row]['override']])
- elif data[row]['group'] == "pip2" or data[row]['group'] == "pip3" or data[row]['group'] == "os_pkg" or data[row]['group'] == "other":
+ elif data[row]['group'] == "pip2" or data[row]['group'] == "pip3" or data[row]['group'] == "os_pkg" or data[row]['group'] == "others":
pkgs['libraries'][data[row]['group']].append(
[data[row]['name'], data[row]['version']])
else:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org