From 687f28845361b7fb84142fb63fc461fabc679acf Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 19 Feb 2017 12:58:58 +0100 Subject: [PATCH] Update PyInstaller env We now use PyQt5 from PyPI and apply xoviat's patch for PyQt. --- misc/requirements/requirements-pyinstaller.txt | 4 +++- misc/requirements/requirements-pyinstaller.txt-raw | 3 ++- tox.ini | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt index b4407f32b..88c81b7eb 100644 --- a/misc/requirements/requirements-pyinstaller.txt +++ b/misc/requirements/requirements-pyinstaller.txt @@ -1,3 +1,5 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py --e git+https://github.com/pyinstaller/pyinstaller.git#egg=PyInstaller +-e git+https://github.com/pyinstaller/pyinstaller.git@develop#egg=PyInstaller +PyQt5==5.8 +sip==4.19.1 diff --git a/misc/requirements/requirements-pyinstaller.txt-raw b/misc/requirements/requirements-pyinstaller.txt-raw index 7a4e021d9..bf06fc84e 100644 --- a/misc/requirements/requirements-pyinstaller.txt-raw +++ b/misc/requirements/requirements-pyinstaller.txt-raw @@ -1,4 +1,5 @@ -e git+https://github.com/pyinstaller/pyinstaller.git@develop#egg=PyInstaller +PyQt5 # remove @commit-id for scm installs -#@ replace: @.*# # \ No newline at end of file +#@ replace: @.*# @develop# \ No newline at end of file diff --git a/tox.ini b/tox.ini index 2a9ed8c24..a4e241b21 100644 --- a/tox.ini +++ b/tox.ini @@ -258,7 +258,12 @@ deps = -r{toxinidir}/misc/requirements/requirements-pip.txt -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-pyinstaller.txt +whitelist_externals = + patch + wget commands = + wget https://patch-diff.githubusercontent.com/raw/pyinstaller/pyinstaller/pull/2403.patch -O {envtmpdir}/pyqt.patch -o/dev/null + patch -f -p1 -d {envdir}/src/pyinstaller -i {envtmpdir}/pyqt.patch {envpython} scripts/link_pyqt.py --tox {envdir} {envbindir}/pyinstaller --noconfirm misc/qutebrowser.spec