Skip to content

Commit d90e2ba

Browse files
author
stonebig
committed
cleanup
1 parent 3b1f215 commit d90e2ba

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

winpython/utils.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -561,23 +561,21 @@ def source_to_wininst(fname, python_exe=None,
561561
architecture=architecture, verbose=verbose)
562562

563563

564-
def wheel_pip_install(fname, python_exe=None,
564+
def direct_pip_install(fname, python_exe=None,
565565
architecture=None, verbose=False, install_options=None):
566-
"""direct install via pip !"""
566+
"""Direct install via pip !"""
567567
copy_to = osp.dirname(fname)
568568

569569
if python_exe is None:
570570
python_exe = sys.executable
571571
assert osp.isfile(python_exe)
572572
myroot = os.path.dirname(python_exe)
573573

574-
# cmd = [python_exe, myroot + r'\Scripts\pip-script.py', 'install']
575574
cmd = [python_exe, '-m', 'pip', 'install']
576575
if install_options:
577576
cmd += install_options # typically ['--no-deps']
578-
print('wheel install_options', install_options)
577+
print('pip install_options', install_options)
579578
cmd += [fname]
580-
# print('build_wheel', myroot, cmd)
581579

582580
if verbose:
583581
subprocess.call(cmd, cwd=myroot)

winpython/wppm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ def install_bdist_wheel(self, package, install_options=None):
558558
self._print(package, "Installing Wheel")
559559
# targetdir = utils.extract_msi(package.fname, targetdir=self.target)
560560
try:
561-
fname = utils.wheel_pip_install(package.fname,
561+
fname = utils.direct_pip_install(package.fname,
562562
python_exe=osp.join(self.target, 'python.exe'),
563563
architecture=self.architecture, verbose=self.verbose,
564564
install_options=install_options)

0 commit comments

Comments
 (0)