Skip to content

Commit

Permalink
Downgrade to build with python 3.11 due to issue with numpy and nuitka
Browse files Browse the repository at this point in the history
  • Loading branch information
laggykiller committed May 30, 2024
1 parent 36c2176 commit 86a237f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python 3.12
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.12"
python-version: "3.11"
allow-prereleases: true
- name: Build for ${{matrix.TARGET}}
run: ${{matrix.CMD_BUILD}}
Expand Down
12 changes: 6 additions & 6 deletions AppImageBuilder-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AppDir:
name: sticker-convert
icon: sticker-convert
version: latest
exec: usr/bin/python3.12
exec: usr/bin/python3.11
exec_args: "$APPDIR/usr/src/sticker-convert.py $@"

apt:
Expand All @@ -46,9 +46,9 @@ AppDir:
- sourceline: deb [arch=arm64] http://archive.canonical.com/ubuntu focal partner

include:
- python3.12
- python3.12-tk
- python3.12-distutils
- python3.11
- python3.11-tk
- python3.11-distutils
exclude: []

runtime:
Expand All @@ -58,9 +58,9 @@ AppDir:
PYTHONHOME: '${APPDIR}/usr'
# Path to the site-packages dir or other modules dirs
# See https://docs.python.org/3/using/cmdline.html#envvar-PYTHONPATH
PYTHONPATH: '${APPDIR}/usr/lib/python3.12/site-packages'
PYTHONPATH: '${APPDIR}/usr/lib/python3.11/site-packages'
# SSL Certificates are placed in a different location for every system therefore we ship our own copy
SSL_CERT_FILE: '${APPDIR}/usr/lib/python3.12/site-packages/certifi/cacert.pem'
SSL_CERT_FILE: '${APPDIR}/usr/lib/python3.11/site-packages/certifi/cacert.pem'
# Tcl library has to be specified or else cannot find init.tcl
TCL_LIBRARY: '${APPDIR}/usr/share/tcltk/tcl8.6'

Expand Down
20 changes: 10 additions & 10 deletions AppImageBuilder-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ AppDir:
name: sticker-convert
icon: sticker-convert
version: latest
exec: usr/bin/python3.12
exec: usr/bin/python3.11
exec_args: "$APPDIR/usr/src/sticker-convert.py $@"

apt:
Expand All @@ -43,20 +43,20 @@ AppDir:
- sourceline: deb http://security.ubuntu.com/ubuntu focal-security multiverse

include:
- python3.12
- python3.12-tk
- python3.12-distutils
- python3.11
- python3.11-tk
- python3.11-distutils
exclude: []

after_bundle: |
export PYTHONHOME=$(pwd)/AppDir/usr
export PYTHONPATH=$(pwd)/AppDir/usr/lib/python3.12/site-packages:$(pwd)/AppDir/usr/lib/python3.12
export PYTHONPATH=$(pwd)/AppDir/usr/lib/python3.11/site-packages:$(pwd)/AppDir/usr/lib/python3.11
export PATH=$(pwd)/AppDir/usr/bin:$PATH
# Install pip
curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12
curl -sS https://bootstrap.pypa.io/get-pip.py | python3.11
# Install pip packages
AppDir/usr/bin/python3.12 -m pip install --ignore-installed --prefix=/usr --root=AppDir -r ./requirements.txt
AppDir/usr/bin/python3.12 -m pip install --ignore-installed --prefix=/usr --root=AppDir certifi opencv-python
AppDir/usr/bin/python3.11 -m pip install --ignore-installed --prefix=/usr --root=AppDir -r ./requirements.txt
AppDir/usr/bin/python3.11 -m pip install --ignore-installed --prefix=/usr --root=AppDir certifi opencv-python
runtime:
env:
Expand All @@ -65,9 +65,9 @@ AppDir:
PYTHONHOME: '${APPDIR}/usr'
# Path to the site-packages dir or other modules dirs
# See https://docs.python.org/3/using/cmdline.html#envvar-PYTHONPATH
PYTHONPATH: '${APPDIR}/usr/lib/python3.12/site-packages'
PYTHONPATH: '${APPDIR}/usr/lib/python3.11/site-packages'
# SSL Certificates are placed in a different location for every system therefore we ship our own copy
SSL_CERT_FILE: '${APPDIR}/usr/lib/python3.12/site-packages/certifi/cacert.pem'
SSL_CERT_FILE: '${APPDIR}/usr/lib/python3.11/site-packages/certifi/cacert.pem'
# Tcl library has to be specified or else cannot find init.tcl
TCL_LIBRARY: '${APPDIR}/usr/share/tcltk/tcl8.6'

Expand Down

0 comments on commit 86a237f

Please sign in to comment.