diff --git a/manifest.toml b/manifest.toml index 9b20603..2fce4b8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -111,7 +111,7 @@ ram.runtime = "500M" armhf.sha256 = "171fcf08b726d452e1c4cd22dadb9f8f5cf6848424ebc1e04cde5be34ef3d7f6" [resources.apt] - packages = ["expect", "ffmpeg", "pkgconf", + packages = ["expect", "ffmpeg", "python3", "python3-venv", "python3-setuptools", "python3-pip", "python3-dev", "python3-requests", "python3-scipy", "python3-matplotlib", "mariadb-server", "libmariadb-dev-compat", "libmariadb-dev", diff --git a/scripts/_common.sh b/scripts/_common.sh index d310254..0a5b4b2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -38,8 +38,12 @@ install_dependance() { else pip3 install --upgrade cffi==1.14.0 fi - - pip3 install --upgrade future mysqlclient PyMySQL 'Pillow<10.0.0' pylibmc captcha Jinja2 'SQLAlchemy<2' psd-tools django-pylibmc django-simple-captcha python3-ldap pycryptodome==3.12.0 lxml + if [ -n "$(uname -m | grep x86_64)" ]; then + py_dependancy="django==3.2.* Pillow<10.0.0 pylibmc captcha jinja2 SQLAlchemy<2 django-pylibmc django-simple-captcha python3-ldap mysqlclient pycryptodome==3.12.0 lxml python3-ldap" + else + py_dependancy="lxml python3-ldap" + fi + pip3 install --upgrade --timeout=3600 $py_dependancy set +$u_arg; deactivate