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 2022/10/20 13:34:46 UTC
[incubator-datalab] branch epm-v2.5.2.1 updated: fixed conflict
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/epm-v2.5.2.1 by this push:
new 489e4f560 fixed conflict
489e4f560 is described below
commit 489e4f5601f04fdb24517f27f330c610f64ef6a2
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Oct 20 16:33:41 2022 +0300
fixed conflict
---
.../src/general/scripts/os/get_list_available_pkgs.py | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py b/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py
index c8f655347..ed38e371f 100644
--- a/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py
@@ -69,13 +69,8 @@ def get_available_pip_pkgs(version):
def get_uncategorised_pip_pkgs(all_pkgs_pip2, all_pkgs_pip3):
try:
pip_pkgs = dict()
-<<<<<<< HEAD
- attempts = 0
- while attempts < 3:
-=======
attempt = 0
while attempt < 3:
->>>>>>> 80e8ea9dc... [DATALAB-2768]: changed retrying cycle concept
try:
client = xmlrpc.client.ServerProxy('https://pypi.python.org/pypi')
raw_pkgs = client.list_packages()
@@ -83,19 +78,11 @@ def get_uncategorised_pip_pkgs(all_pkgs_pip2, all_pkgs_pip3):
for pkg in raw_pkgs:
if pkg not in all_pkgs_pip2 and pkg not in all_pkgs_pip3:
all_pkgs_other.append(pkg)
-<<<<<<< HEAD
- for pkg in all_pkgs_other:
- pip_pkgs[pkg] = "N/A"
- return pip_pkgs
- except:
- attempts += 1
-=======
for pkg in all_pkgs_other:
pip_pkgs[pkg] = "N/A"
return pip_pkgs
except:
attempt += 1
->>>>>>> 80e8ea9dc... [DATALAB-2768]: changed retrying cycle concept
time.sleep(10)
if attempt == 3:
logging.info("Unable to get uncategorised pip packages")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org