Close #20568: install unversioned pip command on Windows

diff --git a/Misc/NEWS b/Misc/NEWS
index 291365d965f37bdd62903a14619581c0c3f2e49d..3604a307a9ecde948666f92d8e543f7214aa9e0f 100644 (file)
--- 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 8409b81d17259f08330b61a7d05acbe3c69170df..038050b05e620139babcd47849db38b6fcfa1bf8 100644 (file)
--- 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", [