Build linux arm64 with psutil pypi package

laggykiller · Jun 24, 2024 · 7e5ef9a · 7e5ef9a
1 parent 87c20c5
commit 7e5ef9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/AppImageBuilder-arm64.yml b/AppImageBuilder-arm64.yml
@@ -15,13 +15,9 @@ script:
   # Copy appicon
   - cp ./src/sticker_convert/resources/appicon.png AppDir/usr/share/icons/hicolor/256x256/apps/sticker-convert.png
 
-  # Workaround no linux arm64 wheels for psutil
-  # https://github.com/giampaolo/psutil/issues/1972
-  - cat requirements.txt | grep -v 'psutil' | grep -v 'PyMemoryEditor' > requirements-linux-arm64.txt
-
   # Install pip packages
   - mkdir wheel
-  - pip download --python-version=311 --abi=cp311 --platform manylinux2014_aarch64 --only-binary=':all:' -d wheel -r requirements-linux-arm64.txt
+  - pip download --python-version=311 --abi=cp311 --platform manylinux2014_aarch64 --only-binary=':all:' -d wheel -r requirements.txt
   - pip download --python-version=311 --abi=cp311 --platform manylinux2014_aarch64 --only-binary=':all:' -d wheel certifi opencv-python
   - find ./wheel/*.whl -exec bash -c 'mv $0 ${0/-cp*.whl/-py3-none-any.whl}' {} \;
   - pip install --ignore-installed --prefix=/usr --root=AppDir --no-deps ./wheel/*
@@ -53,7 +49,6 @@ AppDir:
       - python3.12
       - python3.12-tk
       - python3.12-distutils
-      - procps
     exclude: []
 
   runtime:

diff --git a/AppImageBuilder-x86_64.yml b/AppImageBuilder-x86_64.yml
@@ -3,7 +3,7 @@
 version: 1
 script:
   # Remove any previous build
-  - rm -rf AppDir  | true
+  - rm -rf AppDir | true
 
   # Make usr dirs
   - mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps/
@@ -46,7 +46,6 @@ AppDir:
       - python3.12
       - python3.12-tk
       - python3.12-distutils
-      - procps
     exclude: []
 
   after_bundle: |