From 8b861cd0392226ebb19063b612528e2106f522b2 Mon Sep 17 00:00:00 2001 From: alfrix Date: Fri, 26 Apr 2024 22:57:51 -0300 Subject: [PATCH] deps: drop python3-distutils fixes #1345, also drop virtualenv distutils was needed previous to the switch to pygobject, now the gobject library marks that package as needed if necessary, so there is no need for adding it explicitly virtualenv is faster to install packages it was particularly notorious on numpy, but since i've dropped numpy and matplotlib, it doesn't make much difference and adds unnecesary dependencies --- scripts/KlipperScreen-install.sh | 9 +-------- scripts/system-dependencies.json | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/scripts/KlipperScreen-install.sh b/scripts/KlipperScreen-install.sh index cec6bd3a..01acd995 100755 --- a/scripts/KlipperScreen-install.sh +++ b/scripts/KlipperScreen-install.sh @@ -6,7 +6,6 @@ KSENV="${KLIPPERSCREEN_VENV:-${HOME}/.KlipperScreen-env}" XSERVER="xinit xinput x11-xserver-utils xserver-xorg-input-evdev xserver-xorg-input-libinput xserver-xorg-legacy xserver-xorg-video-fbdev" CAGE="cage seatd xwayland" -PYTHON="python3-virtualenv virtualenv python3-distutils" PYGOBJECT="libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-3.0" MISC="librsvg2-common libopenjp2-7 wireless-tools libdbus-glib-1-dev autoconf" OPTIONAL="fonts-nanum fonts-ipafont libmpv-dev policykit-1 network-manager" @@ -84,12 +83,6 @@ install_packages() echo_text "Installing KlipperScreen dependencies" sudo apt install -y $OPTIONAL echo "$_" - if sudo apt install -y $PYTHON; then - echo_ok "Installed Python dependencies" - else - echo_error "Installation of Python dependencies failed ($PYTHON)" - exit 1 - fi if sudo apt install -y $PYGOBJECT; then echo_ok "Installed PyGobject dependencies" @@ -119,7 +112,7 @@ create_virtualenv() { echo_text "Creating virtual environment" if [ ! -d ${KSENV} ]; then - virtualenv -p /usr/bin/python3 ${KSENV} + python3 -m venv ${KSENV} fi source ${KSENV}/bin/activate diff --git a/scripts/system-dependencies.json b/scripts/system-dependencies.json index b8fe8dd8..bfc85cd1 100644 --- a/scripts/system-dependencies.json +++ b/scripts/system-dependencies.json @@ -1,8 +1,5 @@ { "debian": [ - "python3-virtualenv", - "virtualenv", - "python3-distutils", "libgirepository1.0-dev", "gcc", "libcairo2-dev", @@ -20,7 +17,6 @@ "autoconf" ], "arch": [ - "python-virtualenv", "cairo", "pkgconf", "gobject-introspection",