Ad5001/docker-ubuntu-pyside-xvfb
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updating PySide6 to v6.7.2

Browse source
This commit is contained in:
Adsooi 2024-09-18 18:26:15 +02:00
parent 5024515881
commit 8077e80497
Signed by: Ad5001
GPG key ID: EF45F9C6AFE20160
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ubuntu-pyside6-xvfb-wine/Dockerfile
View file

@ -1,15 +1,15 @@
FROM ubuntu:jammy FROM ubuntu:noble
ARG PYSIDE2_VERSION=6.6.1 ARG PYSIDE2_VERSION=6.7.2
# Adapted rom https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64 # Adapted from https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64
# Unupdated for a while. # Upstream hasn't been updated for a while.
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ARG WINE_VERSION=winehq-staging ARG WINE_VERSION=winehq-staging
ARG PYTHON_VERSION=3.11.7 ARG PYTHON_VERSION=3.12.6
ARG PYINSTALLER_VERSION=6.3.0 ARG PYINSTALLER_VERSION=6.10.0
# we need wine for this all to work, so we'll use the PPA # we need wine for this all to work, so we'll use the PPA
RUN set -x \ RUN set -x \
@ -38,20 +38,20 @@ ENV PYPI_INDEX_URL=https://pypi.python.org/simple
# install python in wine, using the msi packages to install, extracting # install python in wine, using the msi packages to install, extracting
# the files directly, since installing isn't running correctly. # the files directly, since installing isn't running correctly.
RUN set -x \ RUN set -x \
&& winetricks win7 \ && winetricks win10 \
&& for msifile in `echo core dev exe lib path pip tcltk tools`; do \ && for msifile in `echo core dev exe lib path pip tcltk test ucrt`; do \
wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/amd64/${msifile}.msi"; \ wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/amd64/${msifile}.msi"; \
wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python311; \ wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python312; \
rm ${msifile}.msi; \ rm ${msifile}.msi; \
done \ done \
&& cd /wine/drive_c/Python311 \ && cd /wine/drive_c/Python312 \
&& echo 'wine '\''C:\Python311\python.exe'\'' "$@"' > /usr/bin/python \ && echo 'wine '\''C:\Python312\python.exe'\'' "$@"' > /usr/bin/python \
&& echo 'wine '\''C:\Python311\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \ && echo 'wine '\''C:\Python312\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
&& echo 'wine '\''C:\Python311\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \ && echo 'wine '\''C:\Python312\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
&& echo 'wine '\''C:\Python311\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \ && echo 'wine '\''C:\Python312\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
&& echo 'wine '\''C:\Python311\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \ && echo 'wine '\''C:\Python312\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
&& echo 'assoc .py=PythonScript' | wine cmd \ && echo 'assoc .py=PythonScript' | wine cmd \
&& echo 'ftype PythonScript=c:\Python311\python.exe "%1" %*' | wine cmd \ && echo 'ftype PythonScript=c:\Python312\python.exe "%1" %*' | wine cmd \
&& while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \ && while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \
&& chmod +x /usr/bin/python /usr/bin/easy_install /usr/bin/pip /usr/bin/pyinstaller /usr/bin/pyupdater \ && chmod +x /usr/bin/python /usr/bin/easy_install /usr/bin/pip /usr/bin/pyinstaller /usr/bin/pyupdater \
&& (pip install -U pip || true) \ && (pip install -U pip || true) \
@ -78,4 +78,4 @@ RUN set -x \
RUN apt install -y wget curl p7zip-full git xvfb unzip nsis RUN apt install -y wget curl p7zip-full git xvfb unzip nsis
RUN apt clean RUN apt clean
# Installing pyside6 & pyinstaller # Installing pyside6 & pyinstaller
RUN pip install wheel PySide6==$PYSIDE2_VERSION pyinstaller==$PYINSTALLER_VERSION RUN pip install wheel PySide6==$PYSIDE2_VERSION pyinstaller==$PYINSTALLER_VERSION pytest

7
ubuntu-pyside6-xvfb/Dockerfile
View file

@ -1,10 +1,11 @@
FROM ubuntu:jammy FROM ubuntu:noble
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG PYSIDE2_VERSION=6.6.1 ARG PYSIDE2_VERSION=6.7.2
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
RUN apt-get update RUN apt-get update
RUN apt-get -y install make git python3-pip qml-module-qtquick-controls2 qml-module-qtmultimedia qml-module-qtgraphicaleffects qml-module-qtquick2 xvfb xdotool wmctrl libxcb-cursor0 RUN apt-get -y install make git python3-pip python3-pytest python3-pytest-cov python3-pytestqt xvfb xdotool wmctrl libxcb-cursor0
RUN rm /usr/lib/python3.*/EXTERNALLY-MANAGED # Disable managed environment. We don't care about breaking system packages here.
RUN python3 -m pip install PySide6==$PYSIDE2_VERSION RUN python3 -m pip install PySide6==$PYSIDE2_VERSION
RUN apt clean RUN apt clean