From 6929936bbe06cfe87faca7fa892e2e16c4da36c2 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 2 Feb 2020 09:24:26 +0000 Subject: [PATCH 1/8] Update Dockerfile.arch --- Dockerfile.arch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.arch b/Dockerfile.arch index bb26937..46fd34a 100644 --- a/Dockerfile.arch +++ b/Dockerfile.arch @@ -7,4 +7,4 @@ RUN pacman -Syyu --noconfirm git python qt5-multimedia qt5-svg qt5-webengine qt5 python-webob python-waitress python-requests python-pymediainfo python-qtawesome \ python-opengl python-appdirs python-zeroconf python-flask python-pip python-distro \ flake8 mediainfo mupdf-tools xorg-server-xvfb pyalpm fakeroot patch awk -RUN pip install python-vlc pysword +RUN pip install python-vlc pysword pytest-qt From 46b1a1c9474f2577c120a921aa98a4f2d2a18b66 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 2 Feb 2020 09:25:34 +0000 Subject: [PATCH 2/8] Add Pytest-qt --- Dockerfile.debian | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.debian b/Dockerfile.debian index c3a277b..c2a913d 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -8,5 +8,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive \ python3-websockets python3-webob python3-waitress python3-requests python3-pymediainfo \ python3-qtawesome python3-opengl python3-appdirs python3-vlc python3-zeroconf python3-pip \ python3-flake8 python3-flask python3-distro flake8 mediainfo mupdf-tools xvfb +RUN pip install pytest-qt ADD fixpaths.py /usr/bin/fixpaths RUN chmod a+x /usr/bin/fixpaths From a32e40fe71bc827b83420f77d0a3e74d0e8c4498 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 2 Feb 2020 09:26:13 +0000 Subject: [PATCH 3/8] Add Pytest-qt --- Dockerfile.fedora | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 9ea01ed..7c84274 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -7,3 +7,4 @@ RUN dnf install -y python3-PyQt5 python3-qt5-webengine python3-sqlalchemy python python3-appdirs python3-webob python3-QtAwesome python3-waitress python3-vlc python3-pymediainfo \ python3-pyopengl python-pysword python3-requests python3-zeroconf python3-flake8 python3-flask \ python3-distro mediainfo patch xorg-x11-server-Xvfb ghostscript mupdf +RUN pip install pytest-qt From cc856038d458d9d3ae6fee402429f35c9b269a80 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 2 Feb 2020 09:28:22 +0000 Subject: [PATCH 4/8] Update Dockerfile.fedora --- Dockerfile.fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 7c84274..9ca69bb 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -6,5 +6,5 @@ RUN dnf install -y python3-PyQt5 python3-qt5-webengine python3-sqlalchemy python python3-chardet python3-enchant python3-lxml python3-pyxdg python3-pytest python3-websockets \ python3-appdirs python3-webob python3-QtAwesome python3-waitress python3-vlc python3-pymediainfo \ python3-pyopengl python-pysword python3-requests python3-zeroconf python3-flake8 python3-flask \ - python3-distro mediainfo patch xorg-x11-server-Xvfb ghostscript mupdf + python3-distro mediainfo patch xorg-x11-server-Xvfb ghostscript mupdf python3-pip RUN pip install pytest-qt From c7dc6fe59826e23d50333b83aeb71f4d58e06328 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 2 Feb 2020 09:28:55 +0000 Subject: [PATCH 5/8] Add pytest-qt --- Dockerfile.ubuntu | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 9f50f16..e971d08 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -8,3 +8,4 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive \ python3-websockets python3-webob python3-waitress python3-requests python3-pymediainfo \ python3-qtawesome python3-opengl python3-appdirs python3-vlc python3-zeroconf python3-pip \ python3-flake8 python3-flask python3-distro flake8 mediainfo mupdf-tools xvfb +RUN pip install pytest-qt From ec6178a91cb30827654b69dd673c5ef0460e2dab Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 3 Feb 2020 17:31:44 +0000 Subject: [PATCH 6/8] Update Dockerfile.debian --- Dockerfile.debian | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.debian b/Dockerfile.debian index d082bc3..758a58b 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -7,7 +7,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive \ python3-enchant python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov \ python3-websockets python3-webob python3-waitress python3-requests python3-pymediainfo \ python3-qtawesome python3-opengl python3-appdirs python3-vlc python3-zeroconf python3-pip \ - python3-flake8 python3-flask python3-flask-cors python3-distro flake8 mediainfo mupdf-tools xvfb -RUN pip install pytest-qt + python3-flake8 python3-flask python3-flask-cors python3-distro flake8 mediainfo mupdf-tools xvfb \ + python3-pytestqt ADD fixpaths.py /usr/bin/fixpaths RUN chmod a+x /usr/bin/fixpaths From e2688c41adce0ba1aaa3935b737c503fc85fb5fb Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 3 Feb 2020 17:32:27 +0000 Subject: [PATCH 7/8] Update Dockerfile.ubuntu --- Dockerfile.ubuntu | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index cfb4308..d8bff9c 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -7,5 +7,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive \ python3-enchant python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov \ python3-websockets python3-webob python3-waitress python3-requests python3-pymediainfo \ python3-qtawesome python3-opengl python3-appdirs python3-vlc python3-zeroconf python3-pip \ - python3-flake8 python3-flask python3-flask-cors python3-distro flake8 mediainfo mupdf-tools xvfb -RUN pip install pytest-qt + python3-flake8 python3-flask python3-flask-cors python3-distro flake8 mediainfo mupdf-tools xvfb \ + python3-pytestqt + From d3506287bc0c33d1d8669c50a9eb33f4cd11f43b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 4 Feb 2020 17:02:43 +0000 Subject: [PATCH 8/8] Update Dockerfile.arch --- Dockerfile.arch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.arch b/Dockerfile.arch index 4b3526e..729a7e0 100644 --- a/Dockerfile.arch +++ b/Dockerfile.arch @@ -6,5 +6,5 @@ RUN pacman -Syyu --noconfirm git python qt5-multimedia qt5-svg qt5-webengine qt5 python-beautifulsoup4 python-mako python-pytest python-pytest-cov python-websockets \ python-webob python-waitress python-requests python-pymediainfo python-qtawesome \ python-opengl python-appdirs python-zeroconf python-flask python-pip python-distro \ - flake8 mediainfo mupdf-tools xorg-server-xvfb pyalpm fakeroot patch awk -RUN pip install python-vlc pysword flask-cors pytest-qt + flake8 mediainfo mupdf-tools xorg-server-xvfb pyalpm fakeroot patch awk python-pytest-qt +RUN pip install python-vlc pysword flask-cors