Remove "python-pip" packages.

Orange-OpenSource · Dec 30, 2024 · fb7f2b8 · fb7f2b8
1 parent 14a1463
commit fb7f2b8
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/bin/install_prerequisites_alpine.sh b/bin/install_prerequisites_alpine.sh
@@ -18,7 +18,6 @@ apk add --quiet \
     openssl-dev \
     python3 \
     python3-dev \
-    py3-pip \
     cargo \
     squid \
     jq

diff --git a/bin/install_prerequisites_archlinux.sh b/bin/install_prerequisites_archlinux.sh
@@ -9,7 +9,6 @@ pacman -Syu --noconfirm \
     expect \
     openssl \
     python3 \
-    python-pip \
     python-lxml \
     icu \
     base-devel \
@@ -18,8 +17,9 @@ pacman -Syu --noconfirm \
     openbsd-netcat \
     squid \
     jq
-# Temporary install to patch a python3/pip crash
-pacman -Syu --noconfirm expat
 sudo squid -k shutdown || true
 sudo rm -v /dev/shm/squid*.shm >/dev/null 2>&1 || true
 
+# Temporary install to patch a python3/pip crash
+pacman -Syu --noconfirm expat
+
diff --git a/bin/install_prerequisites_ubuntu.sh b/bin/install_prerequisites_ubuntu.sh
@@ -13,6 +13,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \
     expect \
     curl \
     net-tools \
+    build-essential \
     g++-aarch64-linux-gnu \
     libc6-dev-arm64-cross \
     libxml2-dev \
@@ -22,7 +23,6 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \
     libxml2-dev \
     libssl-dev \
     python3 \
-    python3-pip \
     python3-venv \
     netcat-openbsd \
     squid \

diff --git a/bin/install_prerequisites_windows.ps1 b/bin/install_prerequisites_windows.ps1
@@ -24,8 +24,6 @@ if ($LASTEXITCODE) { Throw }
 # install python 3.11
 choco install --confirm python311
 if ($LASTEXITCODE) { Throw }
-python3 -m pip install --upgrade pip --quiet
-if ($LASTEXITCODE) { Throw }
 
 # install proxy
 echo "==== install Squid"

diff --git a/bin/install_pythonx_for_ubuntu.sh b/bin/install_pythonx_for_ubuntu.sh
@@ -10,5 +10,4 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \
     python3."${python_version}"-venv
 sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3."${python_version}" 1 || true
 sudo update-alternatives --install /usr/bin/python python /usr/bin/python3."${python_version}" 1 || true
-sudo curl -sS https://bootstrap.pypa.io/get-pip.py | python3."${python_version}"
 
diff --git a/contrib/windows/README.md b/contrib/windows/README.md
@@ -28,7 +28,7 @@ Install git, llvm, nsis and python3
 
 ```pwsh
 choco install --confirm --no-progress git winlibs-llvm-free nsis
-choco install --confirm --no-progress python3 --version "3.9.13"
+choco install --confirm --no-progress python311
 python -m pip install --upgrade pip --quiet
 ```