diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt index f8cae3e56..9b16d9413 100644 --- a/misc/requirements/requirements-pyinstaller.txt +++ b/misc/requirements/requirements-pyinstaller.txt @@ -1,5 +1,3 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -e git+https://github.com/pyinstaller/pyinstaller.git@develop#egg=PyInstaller -PyQt5==5.8.1 -sip==4.19.1 diff --git a/misc/requirements/requirements-pyinstaller.txt-raw b/misc/requirements/requirements-pyinstaller.txt-raw index bf06fc84e..5ccd44ec7 100644 --- a/misc/requirements/requirements-pyinstaller.txt-raw +++ b/misc/requirements/requirements-pyinstaller.txt-raw @@ -1,5 +1,4 @@ -e git+https://github.com/pyinstaller/pyinstaller.git@develop#egg=PyInstaller -PyQt5 # remove @commit-id for scm installs #@ replace: @.*# @develop# \ No newline at end of file diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt new file mode 100644 index 000000000..bb4801264 --- /dev/null +++ b/misc/requirements/requirements-pyqt.txt @@ -0,0 +1,4 @@ +# This file is automatically generated by scripts/dev/recompile_requirements.py + +PyQt5==5.8.1 +sip==4.19.1 diff --git a/misc/requirements/requirements-pyqt.txt-raw b/misc/requirements/requirements-pyqt.txt-raw new file mode 100644 index 000000000..37a69c45a --- /dev/null +++ b/misc/requirements/requirements-pyqt.txt-raw @@ -0,0 +1 @@ +PyQt5 \ No newline at end of file diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index ac19c7edc..51132ac0d 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -13,7 +13,7 @@ hypothesis==3.6.1 itsdangerous==0.24 # Jinja2==2.9.5 Mako==1.0.6 -# MarkupSafe==0.23 +# MarkupSafe==1.0 parse==1.8.0 parse-type==0.3.4 py==1.4.32 diff --git a/tox.ini b/tox.ini index b17ddf098..9b720c84c 100644 --- a/tox.ini +++ b/tox.ini @@ -97,7 +97,7 @@ setenv = passenv = {[testenv]passenv} deps = {[testenv]deps} - PyQt5==5.8.0 + PyQt5==5.8.1 commands = {envpython} scripts/dev/run_pytest.py {posargs:tests} [testenv:py36-pyqt58] @@ -146,7 +146,7 @@ commands = {envpython} -c "" usedevelop = true deps = -r{toxinidir}/requirements.txt - PyQt5 + -r{toxinidir}/misc/requirements/requirements-pyqt.txt [testenv:unittests-frozen] # cx_Freeze doesn't support Python 3.5 yet @@ -258,6 +258,7 @@ basepython = python3 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-pyinstaller.txt + -r{toxinidir}/misc/requirements/requirements-pyqt.txt whitelist_externals = patch wget