cleanup

stonebig · stonebig · commit d90e2ba27fa2 · 2015-07-14T09:22:21.000+02:00
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -561,23 +561,21 @@ def source_to_wininst(fname, python_exe=None,
                          architecture=architecture, verbose=verbose)
 
 
-def wheel_pip_install(fname, python_exe=None,
+def direct_pip_install(fname, python_exe=None,
                      architecture=None, verbose=False, install_options=None):
-    """direct install via pip !"""
+    """Direct install via pip !"""
     copy_to = osp.dirname(fname)
 
     if python_exe is None:
         python_exe = sys.executable
     assert osp.isfile(python_exe)
     myroot = os.path.dirname(python_exe)
 
-    # cmd = [python_exe, myroot + r'\Scripts\pip-script.py', 'install']
     cmd = [python_exe, '-m', 'pip', 'install']
     if install_options:
         cmd += install_options  # typically ['--no-deps']
-        print('wheel install_options', install_options)
+        print('pip install_options', install_options)
     cmd += [fname]
-    #  print('build_wheel', myroot, cmd)
 
     if verbose:
         subprocess.call(cmd, cwd=myroot)
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -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_pip_install(package.fname,
+            fname = utils.direct_pip_install(package.fname,
                         python_exe=osp.join(self.target, 'python.exe'),
                         architecture=self.architecture, verbose=self.verbose,
                         install_options=install_options)
