From b31e5642de0e158f4160796099af69e35ba1bf91 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 21:01:55 +0100 Subject: [PATCH] Fix double PyQt5 requirement PyQt5-stubs tries to pull in PyQt5 5.11.3 but we want PyQt 5.12 (which works fine) from requirements-pyqt.txt. --- misc/requirements/requirements-mypy.txt | 4 ++-- misc/requirements/requirements-mypy.txt-raw | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt index fb0d12382..8cac2edcd 100644 --- a/misc/requirements/requirements-mypy.txt +++ b/misc/requirements/requirements-mypy.txt @@ -2,7 +2,7 @@ mypy==0.670 mypy-extensions==0.4.1 -PyQt5==5.12 -PyQt5-sip==4.19.13 +# PyQt5==5.11.3 +# PyQt5-sip==4.19.14 -e git+https://github.com/qutebrowser/PyQt5-stubs.git@wip#egg=PyQt5_stubs typed-ast==1.3.1 diff --git a/misc/requirements/requirements-mypy.txt-raw b/misc/requirements/requirements-mypy.txt-raw index 636ad43a4..92a35ab74 100644 --- a/misc/requirements/requirements-mypy.txt-raw +++ b/misc/requirements/requirements-mypy.txt-raw @@ -3,3 +3,4 @@ mypy # remove @commit-id for scm installs #@ replace: @.*# @wip# +#@ ignore: PyQt5, PyQt5-sip