cleanup code

stonebig · stonebig · commit 3b1f215710ca · 2015-07-14T09:15:10.000+02:00
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -561,9 +561,11 @@ def source_to_wininst(fname, python_exe=None,
                          architecture=architecture, verbose=verbose)
 
 
-def build_wheel(this_whl, python_exe=None, copy_to=None,
-                architecture=None, verbose=False, install_options=None):
-    """Execute the wheel (without dependancies)"""
+def wheel_pip_install(fname, python_exe=None,
+                     architecture=None, verbose=False, install_options=None):
+    """direct install via pip !"""
+    copy_to = osp.dirname(fname)
+
     if python_exe is None:
         python_exe = sys.executable
     assert osp.isfile(python_exe)
@@ -574,7 +576,7 @@ def build_wheel(this_whl, python_exe=None, copy_to=None,
     if install_options:
         cmd += install_options  # typically ['--no-deps']
         print('wheel install_options', install_options)
-    cmd += [this_whl]
+    cmd += [fname]
     #  print('build_wheel', myroot, cmd)
 
     if verbose:
@@ -586,12 +588,12 @@ def build_wheel(this_whl, python_exe=None, copy_to=None,
         the_log = ("%s" % stdout + "\n %s" % stderr)
 
         if ' not find ' in the_log or ' not found ' in the_log:
-            print("Failed to Install: \n %s \n" % this_whl)
+            print("Failed to Install: \n %s \n" % fname)
             print("msg: %s" % the_log)
             raise RuntimeError
         p.stdout.close()
         p.stderr.close()
-    src_fname = this_whl
+    src_fname = fname
     if copy_to is None:
         return src_fname
     else:
@@ -629,15 +631,6 @@ def do_script(this_script, python_exe=None, copy_to=None,
     return 'ok'
 
 
-def wheel_to_wininst(fname, python_exe=None,
-                     architecture=None, verbose=False, install_options=None):
-    """Just install a wheel !"""
-    return build_wheel(fname, python_exe=python_exe,
-                       copy_to=osp.dirname(fname),
-                       architecture=architecture, verbose=verbose,
-                       install_options=install_options)
-
-
 if __name__ == '__main__':
     gcc = get_gcc_version(osp.join(BASE_DIR, 'tools.win32', 'mingw32', 'bin'))
     print(("gcc version: %r" % gcc))
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -133,7 +133,7 @@ def extract_infos(self):
         # New : Binary wheel case
         elif bname.endswith(('32.whl', '64.whl')):
             match = re.match(utils.WHEELBIN_PATTERN, bname)
-            # typical macht is ('scipy', '0.14.1rc1', '34', 'win32')
+            # typical match is ('scipy', '0.14.1rc1', '34', 'win32')
             if match is not None:
                 self.name, self.version,  self.pywheel , arch  = match.groups()
                 # self.pywheel version is '34' not 3.4
@@ -558,7 +558,7 @@ def install_bdist_wheel(self, package, install_options=None):
         self._print(package, "Installing Wheel")
         # targetdir = utils.extract_msi(package.fname, targetdir=self.target)
         try:
-            fname = utils.wheel_to_wininst(package.fname,
+            fname = utils.wheel_pip_install(package.fname,
                         python_exe=osp.join(self.target, 'python.exe'),
                         architecture=self.architecture, verbose=self.verbose,
                         install_options=install_options)
