You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/04/13 07:25:28 UTC
[incubator-datalab] branch DATALAB-2091 updated (de076d3 -> 335baaa)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from de076d3 [DATALAB-2091] - fixed conflicts
new 550fe84 [DATALAB-2091]: fixed function usage
new a4eed99 [DATALAB-2091]: fixed dependency list
new d5dfde2 [DATALAB-2091]: corrected invalid name and invalid version handling
new 335baaa Merge branch 'DATALAB-2091' of https://github.com/apache/incubator-dlab into DATALAB-2091
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/aws/meta_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/fab.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 04/04: Merge branch 'DATALAB-2091' of
https://github.com/apache/incubator-dlab into DATALAB-2091
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 335baaab23e1400d7d71739ae43cc7f43f9308c2
Merge: d5dfde2 de076d3
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Apr 13 10:25:12 2021 +0300
Merge branch 'DATALAB-2091' of https://github.com/apache/incubator-dlab into DATALAB-2091
.../src/general/files/aws/jupyter_description.json | 4 +
.../general/files/azure/jupyter_description.json | 4 +
.../src/general/files/gcp/jupyter_description.json | 4 +
.../java/com/epam/datalab/dto/UserInstanceDTO.java | 21 ++++
.../computational/UserComputationalResource.java | 9 ++
.../gcp/computational/ComputationalCreateGcp.java | 45 +++++++
.../computational/GcpComputationalResource.java | 27 +++--
.../dto/imagemetadata/ComputationalGPU.java} | 23 ++--
.../imagemetadata/ComputationalMetadataDTO.java | 3 +
.../dto/imagemetadata/ExploratoryMetadataDTO.java | 4 +
.../datalab/model/exploratory/Exploratory.java | 3 +
.../datalab/backendapi/core/DockerWarmuper.java | 13 ++-
.../resources/dto/ComputationalCreateFormDTO.java | 3 +
.../resources/dto/ExploratoryCreateFormDTO.java | 115 ++----------------
.../backendapi/resources/dto/UserResourceInfo.java | 10 ++
.../dto/gcp/GcpComputationalCreateForm.java | 17 +++
.../resources/gcp/ComputationalResourceGcp.java | 5 +
.../datalab/backendapi/service/TagService.java | 4 +-
.../datalab/backendapi/service/TagServiceImpl.java | 6 +-
.../service/impl/ComputationalServiceImpl.java | 43 ++-----
.../service/impl/EnvironmentServiceImpl.java | 129 ++++++++++-----------
.../service/impl/ExploratoryServiceImpl.java | 60 ++--------
.../impl/InfrastructureInfoServiceImpl.java | 12 +-
.../datalab/backendapi/util/RequestBuilder.java | 4 +
.../backendapi/service/TagServiceImplTest.java | 8 +-
25 files changed, 280 insertions(+), 296 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 03/04: [DATALAB-2091]: corrected invalid name
and invalid version handling
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit d5dfde23f118be09291c6462b6fa418b27622989
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Apr 12 17:49:47 2021 +0300
[DATALAB-2091]: corrected invalid name and invalid version handling
---
infrastructure-provisioning/src/general/lib/os/fab.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index 7287064..06842c9 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -76,7 +76,7 @@ def install_pip_pkg(requisites, pip_version, lib_group):
pip_pkg = "{}=={}".format(pip_pkg[0], pip_pkg[1])
conn.sudo('{0} install -U {1} --no-cache-dir 2>&1 | tee /tmp/tee.tmp; if ! grep -w -i -E "({2})" /tmp/tee.tmp > '
' /tmp/{0}install_{3}.log; then echo "" > /tmp/{0}install_{3}.log;fi'.format(pip_version, pip_pkg, error_parser, name))
- err = conn.sudo('cat /tmp/{0}install_{1}.log'.format(pip_version, pip_pkg.split("==")[0])).stdout.replace('"', "'").replace('\n', '')
+ err = conn.sudo('cat /tmp/{0}install_{1}.log'.format(pip_version, pip_pkg.split("==")[0])).stdout.replace('"', "'").replace('\n', ' ')
conn.sudo('{0} freeze --all | if ! grep -w -i {1} > /tmp/{0}install_{1}.list; then echo "not_found" > /tmp/{0}install_{1}.list;fi'.format(pip_version, name))
res = conn.sudo('cat /tmp/{0}install_{1}.list'.format(pip_version, name)).stdout.replace('\n', '')
conn.sudo('cat /tmp/tee.tmp | if ! grep "Successfully installed" > /tmp/{0}install_{1}.list; then echo "not_installed" > /tmp/{0}install_{1}.list;fi'.format(pip_version, name))
@@ -103,7 +103,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]
status_msg = "installed"
versions = []
- if 'Could not find a version that satisfies the requirement' in err:
+ if 'Could not find a version that satisfies the requirement' in err and 'ERROR: No matching distribution found for {}=='.format(name) in err:
versions = err[err.find("(from versions: ") + 16: err.find(")\r\n")]
if versions != '' and versions != 'none':
versions = versions.split(', ')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/04: [DATALAB-2091]: fixed function usage
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 550fe84d5087dea0f4b72f93dc6abd3bd205e30a
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Apr 12 15:13:58 2021 +0300
[DATALAB-2091]: fixed function usage
---
infrastructure-provisioning/src/general/lib/aws/meta_lib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/lib/aws/meta_lib.py b/infrastructure-provisioning/src/general/lib/aws/meta_lib.py
index a903fad..692043b 100644
--- a/infrastructure-provisioning/src/general/lib/aws/meta_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/meta_lib.py
@@ -149,7 +149,7 @@ def get_instance_ip_address_by_id(instance_id):
def get_instance_private_ip_address(tag_name, instance_name):
try:
- actions_lib.create_aws_config_files()
+ datalab.actions_lib.create_aws_config_files()
return get_instance_ip_address(tag_name, instance_name).get('Private')
except Exception as err:
logging.error("Error with getting private ip address by name: " + str(err) + "\n Traceback: " + traceback.print_exc(file=sys.stdout))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/04: [DATALAB-2091]: fixed dependency list
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit a4eed9920df710ed0a35e561117646633afb0d7e
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Apr 12 16:21:56 2021 +0300
[DATALAB-2091]: fixed dependency list
---
infrastructure-provisioning/src/general/lib/os/fab.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index 4b9c66b..7287064 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -121,9 +121,9 @@ def install_pip_pkg(requisites, pip_version, lib_group):
if i == name:
dep[n] = ''
else:
- conn.sudo('{0} show {1} 2>&1 | if ! grep Version: /tmp/tee.tmp > '
+ conn.sudo('{0} show {1} 2>&1 | if ! grep Version: > '
'/tmp/{0}_install_{1}.log; then echo "" > /tmp/{0}_install_{1}.log;fi'.format(pip_version, i))
- dep[n] = conn.sudo('cat /tmp/{0}_install_{1}.log'.format(pip_version, i)).stdout.replace('Version: ', '{} v.'.format(i))
+ dep[n] = conn.sudo('cat /tmp/{0}_install_{1}.log'.format(pip_version, i)).stdout.replace('\n', '').replace('Version: ', '{} v.'.format(i))
dep = [i for i in dep if i]
status.append({"group": lib_group, "name": name, "version": version, "status": status_msg,
"error_message": err, "available_versions": versions, "add_pkgs": dep})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org