From b4d72cd581a695927a280745d98ddaa9629968cf Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Tue, 10 Mar 2026 13:37:59 -0700 Subject: [PATCH] remove setuptools and wheel (#1265) --- .github/workflows/package-linux.yml | 2 +- .github/workflows/package-macos.yml | 2 +- .github/workflows/package-osx-legacy.yml | 2 +- .github/workflows/package-windows.yml | 2 +- .github/workflows/package-windows7.yml | 2 +- Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/package-linux.yml b/.github/workflows/package-linux.yml index d54fb33..b1d22d8 100644 --- a/.github/workflows/package-linux.yml +++ b/.github/workflows/package-linux.yml @@ -35,7 +35,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libpng-dev libjpeg-dev p7zip-full p7zip-rar python3-pip squashfs-tools libfuse2 libxcb-cursor0 - python -m pip install --upgrade pip setuptools wheel certifi pyinstaller --no-binary pyinstaller + python -m pip install --upgrade pip certifi pyinstaller --no-binary pyinstaller python -m pip install -r requirements.txt - name: build binary run: | diff --git a/.github/workflows/package-macos.yml b/.github/workflows/package-macos.yml index 60fd7b8..7d56f76 100644 --- a/.github/workflows/package-macos.yml +++ b/.github/workflows/package-macos.yml @@ -38,7 +38,7 @@ jobs: cache: 'pip' - name: Install python dependencies run: | - python -m pip install --upgrade pip setuptools wheel pyinstaller certifi + python -m pip install --upgrade pip pyinstaller certifi pip install -r requirements.txt - name: Install the Apple certificate and provisioning profile # TODO signing diff --git a/.github/workflows/package-osx-legacy.yml b/.github/workflows/package-osx-legacy.yml index 5b2a83d..8094d3b 100644 --- a/.github/workflows/package-osx-legacy.yml +++ b/.github/workflows/package-osx-legacy.yml @@ -40,7 +40,7 @@ jobs: - name: Install Python dependencies run: | python3 --version - pip3 install --upgrade pip setuptools wheel pyinstaller certifi + pip3 install --upgrade pip pyinstaller certifi pip3 install --upgrade -r requirements-osx-legacy.txt ./gen_ui_files.sh - uses: actions/setup-node@v6 diff --git a/.github/workflows/package-windows.yml b/.github/workflows/package-windows.yml index 75624db..7653218 100644 --- a/.github/workflows/package-windows.yml +++ b/.github/workflows/package-windows.yml @@ -45,7 +45,7 @@ jobs: env: PYINSTALLER_COMPILE_BOOTLOADER: 1 run: | - python -m pip install --upgrade pip setuptools wheel + python -m pip install --upgrade pip pip install -r requirements.txt pip install certifi pyinstaller --no-binary pyinstaller - name: build binary diff --git a/.github/workflows/package-windows7.yml b/.github/workflows/package-windows7.yml index 431b577..02fc62a 100644 --- a/.github/workflows/package-windows7.yml +++ b/.github/workflows/package-windows7.yml @@ -37,7 +37,7 @@ jobs: env: PYINSTALLER_COMPILE_BOOTLOADER: 1 run: | - python -m pip install --upgrade pip setuptools wheel + python -m pip install --upgrade pip pip install -r requirements-win7.txt pip install certifi pyinstaller --no-binary pyinstaller .\gen_ui_files.bat diff --git a/Dockerfile b/Dockerfile index 76b8786..398d417 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM python:3.13-slim-bullseye AS builder # Install system dependencies RUN set -x && \ - BUILD_DEPS="build-essential cmake libffi-dev libfreetype6-dev libfontconfig1-dev libpng-dev libjpeg-dev libssl-dev libxft-dev make python3-dev python3-setuptools python3-wheel" && \ + BUILD_DEPS="build-essential cmake libffi-dev libfreetype6-dev libfontconfig1-dev libpng-dev libjpeg-dev libssl-dev libxft-dev make python3-dev" && \ RUNTIME_DEPS="bash ca-certificates chrpath locales locales-all libfreetype6 libfontconfig1 p7zip-full python3 python3-pip libgl1" && \ DEBIAN_FRONTEND=noninteractive apt-get update -y && \ apt-get install -y --no-install-recommends ${BUILD_DEPS} ${RUNTIME_DEPS}