Merge pull request #1933 from stonebig/master

stonebig · web-flow · commit 9a06ebed2729 · 2025-12-29T11:08:41.000+01:00
resolve pip.exe not being there by default
diff --git a/.github/workflows/github_workflows_build-2025_05.yml b/.github/workflows/github_workflows_build-2025_05.yml
@@ -244,7 +244,7 @@ jobs:
         if: env.WINPYREQUIREMENTS != ''
         shell: pwsh
         run: |
-          & "$env:build_location\python\python.exe" -m pip install --upgrade pip
+          & "$env:build_location\python\python.exe" -m pip install --upgrade --force-reinstall pip
           & "$env:build_location\python\python.exe" -m pip install --upgrade packaging==25.0
           & "$env:build_location\python\python.exe" -c "from wppm import wppm;dist=wppm.Distribution();dist.patch_standard_packages('pip', to_movable=True)"
 
diff --git a/.github/workflows/github_workflows_build-2026_01.yml b/.github/workflows/github_workflows_build-2026_01.yml
@@ -180,7 +180,7 @@ jobs:
         if: env.WINPYREQUIREMENTS != ''
         shell: pwsh
         run: |
-          & "$env:build_location\python\python.exe" -m pip install --upgrade pip
+          & "$env:build_location\python\python.exe" -m pip install --upgrade --force-reinstall pip
           & "$env:build_location\python\python.exe" -m pip install --upgrade packaging==25.0
           & "$env:build_location\python\python.exe" -c "from wppm import wppm;dist=wppm.Distribution();dist.patch_standard_packages('pip', to_movable=True)"
 
diff --git a/winpython/portable/launchers_final/scripts/upgrade_pip.bat b/winpython/portable/launchers_final/scripts/upgrade_pip.bat
@@ -2,6 +2,6 @@
 call "%~dp0env.bat"
 echo this will upgrade pip with latest version, then patch it for WinPython portability ok ?
 pause
-"%WINPYDIR%\python.exe" -m pip install --upgrade pip
+"%WINPYDIR%\python.exe" -m pip install --upgrade --force-reinstall pip
 "%WINPYDIR%\python.exe" -c "from wppm import wppm;dist=wppm.Distribution(r'%WINPYDIR%');dist.patch_standard_packages('pip', to_movable=True)
 pause
