ahamilton/eris
1
0
Fork 0
Code Releases Activity

Revert "packaging: Bring dependencies up to date"

Browse source 
This reverts commit a059ae8192.

Python3.12 is not in the stable distros yet.
This commit is contained in:
Andrew Hamilton 2024-07-11 20:27:19 +10:00
parent 6848eff415
commit 79287c19ee
25 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packaging/Dockerfile.debian
View file

@ -3,7 +3,7 @@
FROM debian:bookworm
RUN apt-get update
RUN apt-get install -y python3.12 python3-pip pipx
RUN apt-get install -y python3.11 python3-pip pipx
COPY . eris
RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris
RUN chmod a+rwx -R /root

2
packaging/Dockerfile.fedora
View file

@ -2,7 +2,7 @@
FROM fedora:38
RUN dnf -y install python3.12 python3-pip pipx gcc python3.12-devel
RUN dnf -y install python3.11 python3-pip pipx gcc python3.11-devel
COPY . eris
RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris
RUN chmod a+rwx -R /root

2
packaging/Dockerfile.ubuntu
View file

@ -3,7 +3,7 @@
FROM ubuntu:lunar
RUN apt-get update
RUN apt-get install -y python3.12 python3-pip pipx
RUN apt-get install -y python3.11 python3-pip pipx
COPY . eris
RUN PIPX_BIN_DIR=/bin pipx install --system-site-packages ./eris/eris
RUN chmod a+rwx -R /root

2
packaging/appimage/AppRun
View file

@ -13,7 +13,7 @@ export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/local/bin/:"${PATH}"
export UNION_PRELOAD="${HERE}"
export LD_PRELOAD="${HERE}/libunionpreload.so"
export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
export PYTHONPATH=/usr/local/lib/python3.12/dist-packages:"${PYTHONPATH}"
export PYTHONPATH=/usr/local/lib/python3.11/dist-packages:"${PYTHONPATH}"
if [ -z $APPIMAGE_ENTER ]; then
EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2- | sed -e 's|%.||g')
exec ${EXEC} $@

2
packaging/make-appimage.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.12
#!/usr/bin/env python3.11
import os

2
packaging/make-readme.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.12
#!/usr/bin/env python3.11
# -*- coding: utf-8 -*-

10
packaging/make-snapcraft.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3.12
#!/usr/bin/env python3.11
# -*- coding: utf-8 -*-
@ -27,13 +27,13 @@ apps:
eris:
command: bin/eris
environment:
PYTHONPATH: $SNAP/lib/python3.12/site-packages:$SNAP/lib/python3.12/dist-packages:$PYTHONPATH
PYTHONPATH: $SNAP/lib/python3.11/site-packages:$SNAP/lib/python3.11/dist-packages:$PYTHONPATH
plugs:
- home
webserver:
command: bin/eris-webserver
environment:
PYTHONPATH: $SNAP/lib/python3.12/site-packages:$SNAP/lib/python3.12/dist-packages:$PYTHONPATH
PYTHONPATH: $SNAP/lib/python3.11/site-packages:$SNAP/lib/python3.11/dist-packages:$PYTHONPATH
plugs:
- home
- network-bind
@ -53,9 +53,9 @@ parts:
- ./fill3
- ./eris
build-environment:
- SNAPCRAFT_PYTHON_INTERPRETER: python3.12
- SNAPCRAFT_PYTHON_INTERPRETER: python3.11
stage-packages:
- python3.12-venv
- python3.11-venv
- python3-distutils
- python3-pkg-resources
- """, end="")