[Python-checkins] cpython (3.4): Close #20568: install unversioned pip command on Windows

Mon Mar 17 07:33:07 CET 2014

http://hg.python.org/cpython/rev/5d190cca2f47
changeset: 89776:5d190cca2f47
branch: 3.4
user: Nick Coghlan <ncoghlan at gmail.com>
date: Fri Feb 28 23:37:35 2014 +1000
summary:
 Close #20568: install unversioned pip command on Windows
files:
 Misc/NEWS | 3 +++
 Tools/msi/msi.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Build
 -----
 
+- Issue #20568: The Windows installer now installs the unversioned ``pip``
+ command in addition to the versioned ``pip3`` and ``pip3.4`` commands.
+
 - Issue #20757: The ensurepip helper for the Windows uninstaller now skips
 uninstalling pip (rather than failing) if the user has updated pip to a
 different version from the one bundled with ensurepip.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -420,7 +420,7 @@
 
 compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests|venv\\scripts" "[TARGETDIR]Lib"'
 lib2to3args = r'-c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"'
- updatepipargs = r'-m ensurepip -U'
+ updatepipargs = r'-m ensurepip -U --default-install'
 removepipargs = r'-m ensurepip._uninstall'
 # See "CustomAction Table"
 add_data(db, "CustomAction", [
-- 
Repository URL: http://hg.python.org/cpython
