summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2014-02-28 13:37:35 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2014-02-28 13:37:35 (GMT)
commitf808df39debb2f5ba8bfe6dee767efd896c4c1bd (patch)
treeded5d918315c4485dad2e739981240bf3b240423
parent4a6dc3a72646ab003a40a3ef37ac75485c5cd2cc (diff)
downloadcpython-f808df39debb2f5ba8bfe6dee767efd896c4c1bd.zip
cpython-f808df39debb2f5ba8bfe6dee767efd896c4c1bd.tar.gz
cpython-f808df39debb2f5ba8bfe6dee767efd896c4c1bd.tar.bz2
Close #20568: install unversioned pip command on Windows
-rw-r--r--Misc/NEWS3
-rw-r--r--Tools/msi/msi.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 291365d..3604a30 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,9 @@ Tests
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
index 8409b81..038050b 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -420,7 +420,7 @@ def add_ui(db):
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", [