switch pyzmq to wheel, skip some warnings from pip 8.0

sdpython · Jan 21, 2016 · e37b3d3 · e37b3d3
1 parent 11935e3
commit e37b3d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/pymyinstall/installhelper/install_cmd_helper.py b/src/pymyinstall/installhelper/install_cmd_helper.py
@@ -565,8 +565,14 @@ def update_pip(python_path=None, fLOG=print):
                     raise UpdatePipError(
                         "unable to update pip with get_pip.\nCMD:\n{0}\nOUT:\n{1}\nERR:\n{2}".format(cmd, out, err))
         else:
-            raise UpdatePipError(
-                "unable to update pip.\nCMD:\n{0}\nOUT:\n{1}\nERR:\n{2}".format(cmd, out, err))
+            lines = err.split("\n")
+            keep = []
+            for line in lines:
+                if not line.startswith(" ") and "RuntimeWarning: Config variable" not in line:
+                    keep.append(line)
+            if len(keep) > 0:
+                raise UpdatePipError(
+                    "unable to update pip.\nCMD:\n{0}\nOUT:\n{1}\nERR:\n{2}".format(cmd, out, err))
     return out
 
 

diff --git a/src/pymyinstall/packaged/packaged_config_1_small.py b/src/pymyinstall/packaged/packaged_config_1_small.py
@@ -62,7 +62,7 @@ def small_set():
             "sockjs-tornado", "pip", mname="sockjs.tornado", usage="NETWORK",
             purpose="SockJS-tornado is a Python server side counterpart of SockJS-client browser library running on top of Tornado framework."),
         ModuleInstall(
-            "pyzmq", "pip", mname="zmq", purpose="python librairies for Omz (pipy distributes the binaries)", usage="NETWORK"),
+            "pyzmq", "wheel", mname="zmq", purpose="python librairies for Omz (pipy distributes the binaries)", usage="NETWORK"),
         ModuleInstall(
             "pycparser", "pip", purpose="pycparser is a complete parser of the C language, written in pure Python using the PLY parsing library. It parses C code into an AST and can serve as a front-end for C compilers or analysis tools."),
         ModuleInstall("Cython", "wheel", mname="cython",