Merge pull request #832 from stonebig/master

stonebig · web-flow · commit a200795daa40 · 2020-04-08T19:07:43.000+02:00
modernize utils
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '2.3.20200406'
+__version__ = '2.3.20200408'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -2500,3 +2500,12 @@ description = Backport of pathlib-compatible object wrapper for zip files
 [z3-solver]
 description = an efficient SMT solver library
 
+[umap-learn]
+description = Uniform Manifold Approximation and Projection
+
+[tensorboard-plugin-wit]
+description = What-If Tool TensorBoard plugin.
+
+[tbb]
+description = Intel(R) Threading Building Blocks
+
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -253,6 +253,21 @@ def exec_shell_cmd(args, path):
     )
     return decode_fs_string(process.stdout.read())
 
+def exec_run_cmd(args, path=None):
+    """run a single command (*args* is a list of arguments) in optional *path*"""
+    # only applicable to Python-3.5+
+    # python-3.7+ allows to replace "stdout and stderr ", per "capture_output=True"
+    if path:
+        process = subprocess.run(args,
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
+                                cwd=path)
+    else:
+        process = subprocess.run(args,
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE)
+        return  decode_fs_string(process.stdout)
+
 
 def get_r_version(path):
     """Return version of the R installed in *path*"""
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -51,9 +51,12 @@ def get_official_description(name):
         dir_path = os.path.dirname(sys.executable)
         this = normalize(name)
         this_len = len(this)
-        pip_ask = 'pip search '+ this
+        pip_ask = ['pip', 'search', this, '--retries', '0']
+        if len(this)<2:  # don't ask stupid things
+            return ''
         try:
-            pip_res = (utils.exec_shell_cmd(pip_ask, dir_path)+'\n').splitlines()
+            #  .run work when .popen fails when no internet
+            pip_res = (utils.exec_run_cmd(pip_ask)+'\n').splitlines()
             pip_filter = [l for l in pip_res if this + " (" ==
                           normalize(l[:this_len])+l[this_len:this_len+2]]
             pip_desc = (pip_filter[0][len(this)+1:]).split(" - ", 1)[1] 
