From 7a34a03153cf09d1628c1b4328ce1d757f89dc21 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:15 +0100 Subject: [PATCH 01/51] Update flake8 from 3.6.0 to 3.7.5 --- misc/requirements/requirements-flake8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index 42255f825..492688e5a 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py attrs==18.2.0 -flake8==3.6.0 +flake8==3.7.5 flake8-bugbear==18.8.0 flake8-builtins==1.4.1 flake8-comprehensions==1.4.1 From 8e486dca16a358920e2eeb980aa4fcdcb6aa6f13 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:17 +0100 Subject: [PATCH 02/51] Update flake8-comprehensions from 1.4.1 to 2.0.0 --- misc/requirements/requirements-flake8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index 492688e5a..acc49124c 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -4,7 +4,7 @@ attrs==18.2.0 flake8==3.7.5 flake8-bugbear==18.8.0 flake8-builtins==1.4.1 -flake8-comprehensions==1.4.1 +flake8-comprehensions==2.0.0 flake8-copyright==0.2.2 flake8-debugger==3.1.0 flake8-deprecated==1.3 From 2472b4a7d7e100c8da3224c2d3d608093d049fe7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:18 +0100 Subject: [PATCH 03/51] Update flake8-per-file-ignores from 0.7 to 0.8.1 --- misc/requirements/requirements-flake8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index acc49124c..df997357f 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -11,7 +11,7 @@ flake8-deprecated==1.3 flake8-docstrings==1.3.0 flake8-future-import==0.4.5 flake8-mock==0.3 -flake8-per-file-ignores==0.7 +flake8-per-file-ignores==0.8.1 flake8-polyfill==1.0.2 flake8-string-format==0.2.3 flake8-tidy-imports==1.1.0 From 3f10c664dd77bc4613c9f561d801a8a8eecb647d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:20 +0100 Subject: [PATCH 04/51] Update flake8-tidy-imports from 1.1.0 to 2.0.0 --- misc/requirements/requirements-flake8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index df997357f..64aa0cb77 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -14,7 +14,7 @@ flake8-mock==0.3 flake8-per-file-ignores==0.8.1 flake8-polyfill==1.0.2 flake8-string-format==0.2.3 -flake8-tidy-imports==1.1.0 +flake8-tidy-imports==2.0.0 flake8-tuple==0.2.13 mccabe==0.6.1 pathmatch==0.2.1 From f41be46104c327eea2c10582eed9e83efe14ea7e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:21 +0100 Subject: [PATCH 05/51] Update pep8-naming from 0.7.0 to 0.8.2 --- misc/requirements/requirements-flake8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index 64aa0cb77..e7ebd8daa 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -18,7 +18,7 @@ flake8-tidy-imports==2.0.0 flake8-tuple==0.2.13 mccabe==0.6.1 pathmatch==0.2.1 -pep8-naming==0.7.0 +pep8-naming==0.8.2 pycodestyle==2.4.0 pydocstyle==3.0.0 pyflakes==2.0.0 From e980dd7ea0da7b471bd43cfe40373426f0d82bf4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:23 +0100 Subject: [PATCH 06/51] Update pycodestyle from 2.4.0 to 2.5.0 --- misc/requirements/requirements-flake8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index e7ebd8daa..d1fff2eee 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -19,7 +19,7 @@ flake8-tuple==0.2.13 mccabe==0.6.1 pathmatch==0.2.1 pep8-naming==0.8.2 -pycodestyle==2.4.0 +pycodestyle==2.5.0 pydocstyle==3.0.0 pyflakes==2.0.0 six==1.12.0 From 10c0f3d9866aa5e9cf7b3db5ab6d58d986a43a2b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:24 +0100 Subject: [PATCH 07/51] Update pyflakes from 2.0.0 to 2.1.0 --- misc/requirements/requirements-flake8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index d1fff2eee..a3606430d 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -21,7 +21,7 @@ pathmatch==0.2.1 pep8-naming==0.8.2 pycodestyle==2.5.0 pydocstyle==3.0.0 -pyflakes==2.0.0 +pyflakes==2.1.0 six==1.12.0 snowballstemmer==1.2.1 typing==3.6.6 From fed127d7a76a8971c32b6286cc55fbc54a1a194a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:26 +0100 Subject: [PATCH 08/51] Update mypy from 0.650 to 0.670 --- misc/requirements/requirements-mypy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt index 6b8c63e97..fe8f55f46 100644 --- a/misc/requirements/requirements-mypy.txt +++ b/misc/requirements/requirements-mypy.txt @@ -1,6 +1,6 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -mypy==0.650 +mypy==0.670 mypy-extensions==0.4.1 PyQt5==5.11.3 PyQt5-sip==4.19.13 From 61b2551e46f527841d9d4df7e8230297875ea5cf Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:28 +0100 Subject: [PATCH 09/51] Update pyqt5 from 5.11.3 to 5.12 --- misc/requirements/requirements-mypy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt index fe8f55f46..4e47aa081 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.11.3 +PyQt5==5.12 PyQt5-sip==4.19.13 -e git+https://github.com/qutebrowser/PyQt5-stubs.git@wip#egg=PyQt5_stubs typed-ast==1.1.1 From b3c5cbbd12396ac22b07bece5437918c7d991926 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:29 +0100 Subject: [PATCH 10/51] Update pyqt5 from 5.11.3 to 5.12 --- misc/requirements/requirements-pyqt.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt index 32aee87a9..539b101ba 100644 --- a/misc/requirements/requirements-pyqt.txt +++ b/misc/requirements/requirements-pyqt.txt @@ -1,4 +1,4 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt5==5.11.3 +PyQt5==5.12 PyQt5-sip==4.19.13 From 22b2e8c539c111578f7b12acd52601ec6a4df9be Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:31 +0100 Subject: [PATCH 11/51] Update typed-ast from 1.1.1 to 1.3.1 --- misc/requirements/requirements-mypy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt index 4e47aa081..fb0d12382 100644 --- a/misc/requirements/requirements-mypy.txt +++ b/misc/requirements/requirements-mypy.txt @@ -5,4 +5,4 @@ mypy-extensions==0.4.1 PyQt5==5.12 PyQt5-sip==4.19.13 -e git+https://github.com/qutebrowser/PyQt5-stubs.git@wip#egg=PyQt5_stubs -typed-ast==1.1.1 +typed-ast==1.3.1 From 4fca20bcec2bf9c14649d8bc1c23df5183f82fb7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:33 +0100 Subject: [PATCH 12/51] Update hunter from 2.1.0 to 2.2.1 --- misc/requirements/requirements-optional.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-optional.txt b/misc/requirements/requirements-optional.txt index aafa38e46..e0b5f0609 100644 --- a/misc/requirements/requirements-optional.txt +++ b/misc/requirements/requirements-optional.txt @@ -2,6 +2,6 @@ colorama==0.4.1 cssutils==1.0.2 -hunter==2.1.0 +hunter==2.2.1 Pympler==0.6 six==1.12.0 From 1dca42b1bd17ccce70589fc4d194b03e182190e9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:34 +0100 Subject: [PATCH 13/51] Update hunter from 2.1.0 to 2.2.1 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 228045f8c..1fc1ab256 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -11,7 +11,7 @@ coverage==4.5.2 EasyProcess==0.2.5 Flask==1.0.2 glob2==0.6 -hunter==2.1.0 +hunter==2.2.1 hypothesis==3.85.2 itsdangerous==1.1.0 # Jinja2==2.10 From 14955a46a3b91f2cb5d5bb387f71777a0889601a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:36 +0100 Subject: [PATCH 14/51] Update packaging from 18.0 to 19.0 --- misc/requirements/requirements-pip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt index f15a3a3e1..a5faa61d4 100644 --- a/misc/requirements/requirements-pip.txt +++ b/misc/requirements/requirements-pip.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py appdirs==1.4.3 -packaging==18.0 +packaging==19.0 pyparsing==2.3.0 setuptools==40.6.3 six==1.12.0 From 7abc4e9804d4c46c46e3797c8b48f9f6f67475d7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:38 +0100 Subject: [PATCH 15/51] Update packaging from 18.0 to 19.0 --- misc/requirements/requirements-sphinx.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt index c089895d1..1c22ae343 100644 --- a/misc/requirements/requirements-sphinx.txt +++ b/misc/requirements/requirements-sphinx.txt @@ -9,7 +9,7 @@ idna==2.8 imagesize==1.1.0 Jinja2==2.10 MarkupSafe==1.1.0 -packaging==18.0 +packaging==19.0 Pygments==2.3.1 pyparsing==2.3.0 pytz==2018.7 From 2774b6335515571c230d5bcc9d1766c63189478c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:39 +0100 Subject: [PATCH 16/51] Update pyparsing from 2.3.0 to 2.3.1 --- misc/requirements/requirements-pip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt index a5faa61d4..6b5dc8e21 100644 --- a/misc/requirements/requirements-pip.txt +++ b/misc/requirements/requirements-pip.txt @@ -2,7 +2,7 @@ appdirs==1.4.3 packaging==19.0 -pyparsing==2.3.0 +pyparsing==2.3.1 setuptools==40.6.3 six==1.12.0 wheel==0.32.3 From 9caa43aba28f285e8232e91cb57fc6d9dfeaff87 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:41 +0100 Subject: [PATCH 17/51] Update pyparsing from 2.3.0 to 2.3.1 --- misc/requirements/requirements-sphinx.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt index 1c22ae343..84029ab8b 100644 --- a/misc/requirements/requirements-sphinx.txt +++ b/misc/requirements/requirements-sphinx.txt @@ -11,7 +11,7 @@ Jinja2==2.10 MarkupSafe==1.1.0 packaging==19.0 Pygments==2.3.1 -pyparsing==2.3.0 +pyparsing==2.3.1 pytz==2018.7 requests==2.21.0 six==1.12.0 From 8bf4a9a93e43fd1fb93096f5bb767a0dfd4c10f1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:42 +0100 Subject: [PATCH 18/51] Update setuptools from 40.6.3 to 40.8.0 --- misc/requirements/requirements-pip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt index 6b5dc8e21..909fcc8c6 100644 --- a/misc/requirements/requirements-pip.txt +++ b/misc/requirements/requirements-pip.txt @@ -3,6 +3,6 @@ appdirs==1.4.3 packaging==19.0 pyparsing==2.3.1 -setuptools==40.6.3 +setuptools==40.8.0 six==1.12.0 wheel==0.32.3 From 75e6575233720732582944b34b9c433ac1b595f5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:44 +0100 Subject: [PATCH 19/51] Update cryptography from 2.4.2 to 2.5 --- misc/requirements/requirements-pylint.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index b3ecdaf70..7ff3a3cd8 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -5,7 +5,7 @@ astroid==2.1.0 certifi==2018.11.29 cffi==1.11.5 chardet==3.0.4 -cryptography==2.4.2 +cryptography==2.5 github3.py==1.2.0 idna==2.8 isort==4.3.4 From 6a51244cb094f57973cf2229087d4ec1fdc580a3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:46 +0100 Subject: [PATCH 20/51] Update github3.py from 1.2.0 to 1.3.0 --- misc/requirements/requirements-pylint.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 7ff3a3cd8..6e4114eb3 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -6,7 +6,7 @@ certifi==2018.11.29 cffi==1.11.5 chardet==3.0.4 cryptography==2.5 -github3.py==1.2.0 +github3.py==1.3.0 idna==2.8 isort==4.3.4 jwcrypto==0.6.0 From 14a6c1f2e42d57e6bb848fb0993b7953a442053f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:48 +0100 Subject: [PATCH 21/51] Update python-dateutil from 2.7.5 to 2.8.0 --- misc/requirements/requirements-pylint.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 6e4114eb3..0fc83d6a8 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -14,7 +14,7 @@ lazy-object-proxy==1.3.1 mccabe==0.6.1 pycparser==2.19 pylint==2.2.2 -python-dateutil==2.7.5 +python-dateutil==2.8.0 ./scripts/dev/pylint_checkers requests==2.21.0 six==1.12.0 From b434498a6c5a7aa0d1557f5edbf20eadce668ff9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:49 +0100 Subject: [PATCH 22/51] Update wrapt from 1.10.11 to 1.11.1 --- misc/requirements/requirements-pylint.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 0fc83d6a8..3c0c51e60 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -20,4 +20,4 @@ requests==2.21.0 six==1.12.0 uritemplate==3.0.0 urllib3==1.24.1 -wrapt==1.10.11 +wrapt==1.11.1 From d3c86561e21eca15af4c6992850154f95a699097 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:51 +0100 Subject: [PATCH 23/51] Update pytz from 2018.7 to 2018.9 --- misc/requirements/requirements-sphinx.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt index 84029ab8b..fa9e595f3 100644 --- a/misc/requirements/requirements-sphinx.txt +++ b/misc/requirements/requirements-sphinx.txt @@ -12,7 +12,7 @@ MarkupSafe==1.1.0 packaging==19.0 Pygments==2.3.1 pyparsing==2.3.1 -pytz==2018.7 +pytz==2018.9 requests==2.21.0 six==1.12.0 snowballstemmer==1.2.1 From 788ca3fc15d27d0c955a08f9b8babfd5091691fa Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:52 +0100 Subject: [PATCH 24/51] Update sphinx from 1.8.3 to 1.8.4 --- misc/requirements/requirements-sphinx.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt index fa9e595f3..14c247043 100644 --- a/misc/requirements/requirements-sphinx.txt +++ b/misc/requirements/requirements-sphinx.txt @@ -16,6 +16,6 @@ pytz==2018.9 requests==2.21.0 six==1.12.0 snowballstemmer==1.2.1 -Sphinx==1.8.3 +Sphinx==1.8.4 sphinxcontrib-websupport==1.1.0 urllib3==1.24.1 From 34533befe87fc6242e11ecacffd89992f140d0a2 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:54 +0100 Subject: [PATCH 25/51] Update atomicwrites from 1.2.1 to 1.3.0 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 1fc1ab256..40662018f 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -1,6 +1,6 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -atomicwrites==1.2.1 +atomicwrites==1.3.0 attrs==18.2.0 backports.functools-lru-cache==1.5 beautifulsoup4==4.7.0 From 3ec0b39c9f17f61c4f80e99b29e05c407f00b026 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:55 +0100 Subject: [PATCH 26/51] Update beautifulsoup4 from 4.7.0 to 4.7.1 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 40662018f..3a9a550e1 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -3,7 +3,7 @@ atomicwrites==1.3.0 attrs==18.2.0 backports.functools-lru-cache==1.5 -beautifulsoup4==4.7.0 +beautifulsoup4==4.7.1 cheroot==6.5.3 Click==7.0 # colorama==0.4.1 From 43c0bbde7305a8ebd358f5bf217ebc25bbec68a7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:57 +0100 Subject: [PATCH 27/51] Update cheroot from 6.5.3 to 6.5.4 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 3a9a550e1..e16c3757a 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -4,7 +4,7 @@ atomicwrites==1.3.0 attrs==18.2.0 backports.functools-lru-cache==1.5 beautifulsoup4==4.7.1 -cheroot==6.5.3 +cheroot==6.5.4 Click==7.0 # colorama==0.4.1 coverage==4.5.2 From 3a69489f537ddacc8d8797603cea038753a629ad Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:40:58 +0100 Subject: [PATCH 28/51] Update hypothesis from 3.85.2 to 4.5.6 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index e16c3757a..abbd76240 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -12,7 +12,7 @@ EasyProcess==0.2.5 Flask==1.0.2 glob2==0.6 hunter==2.2.1 -hypothesis==3.85.2 +hypothesis==4.5.6 itsdangerous==1.1.0 # Jinja2==2.10 Mako==1.0.7 From a324133e5f4a5563f2482903cdcf778645684436 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:41:00 +0100 Subject: [PATCH 29/51] Update parse from 1.9.0 to 1.11.1 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index abbd76240..0419007dc 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -18,7 +18,7 @@ itsdangerous==1.1.0 Mako==1.0.7 # MarkupSafe==1.1.0 more-itertools==5.0.0 -parse==1.9.0 +parse==1.11.1 parse-type==0.4.2 pluggy==0.8.0 py==1.7.0 From cc820208a11cdda3d9a9f2a6c7be6a23530881f7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:41:01 +0100 Subject: [PATCH 30/51] Update pluggy from 0.8.0 to 0.8.1 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 0419007dc..b245afe0b 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -20,7 +20,7 @@ Mako==1.0.7 more-itertools==5.0.0 parse==1.11.1 parse-type==0.4.2 -pluggy==0.8.0 +pluggy==0.8.1 py==1.7.0 py-cpuinfo==4.0.0 pytest==4.0.2 From 1d793ebac9381b8259ba361f6c4c0f0d01326850 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:41:03 +0100 Subject: [PATCH 31/51] Update pluggy from 0.8.0 to 0.8.1 --- misc/requirements/requirements-tox.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index ed0db2870..9827b9ce8 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py filelock==3.0.10 -pluggy==0.8.0 +pluggy==0.8.1 py==1.7.0 six==1.12.0 toml==0.10.0 From 0a03328dfed493003a982e3ba79deb7f96f3c246 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:41:05 +0100 Subject: [PATCH 32/51] Update pytest from 4.0.2 to 4.2.0 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index b245afe0b..e8d562266 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -23,7 +23,7 @@ parse-type==0.4.2 pluggy==0.8.1 py==1.7.0 py-cpuinfo==4.0.0 -pytest==4.0.2 +pytest==4.2.0 pytest-bdd==3.0.1 pytest-benchmark==3.1.1 pytest-cov==2.6.0 From 787aed8164efb90ad0bc55f40c5f8590c68403bb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:41:06 +0100 Subject: [PATCH 33/51] Update pytest-benchmark from 3.1.1 to 3.2.2 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index e8d562266..3e097d1f5 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -25,7 +25,7 @@ py==1.7.0 py-cpuinfo==4.0.0 pytest==4.2.0 pytest-bdd==3.0.1 -pytest-benchmark==3.1.1 +pytest-benchmark==3.2.2 pytest-cov==2.6.0 pytest-faulthandler==1.5.0 pytest-instafail==0.4.0 From b11f9a2410db89b8911fd12c7a8ee25f06acf988 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:41:08 +0100 Subject: [PATCH 34/51] Update pytest-cov from 2.6.0 to 2.6.1 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 3e097d1f5..aa1058752 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -26,7 +26,7 @@ py-cpuinfo==4.0.0 pytest==4.2.0 pytest-bdd==3.0.1 pytest-benchmark==3.2.2 -pytest-cov==2.6.0 +pytest-cov==2.6.1 pytest-faulthandler==1.5.0 pytest-instafail==0.4.0 pytest-mock==1.10.0 From c1254c39656bc9a71e5416dbd305ebec7d36caad Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:41:09 +0100 Subject: [PATCH 35/51] Update pytest-mock from 1.10.0 to 1.10.1 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index aa1058752..5290866e5 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -29,7 +29,7 @@ pytest-benchmark==3.2.2 pytest-cov==2.6.1 pytest-faulthandler==1.5.0 pytest-instafail==0.4.0 -pytest-mock==1.10.0 +pytest-mock==1.10.1 pytest-qt==3.2.2 pytest-repeat==0.7.0 pytest-rerunfailures==5.0 From 7a944dfac308250786d8ed611bacd1ba56c90df3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:41:11 +0100 Subject: [PATCH 36/51] Update pytest-rerunfailures from 5.0 to 6.0 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 5290866e5..cb128a936 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -32,7 +32,7 @@ pytest-instafail==0.4.0 pytest-mock==1.10.1 pytest-qt==3.2.2 pytest-repeat==0.7.0 -pytest-rerunfailures==5.0 +pytest-rerunfailures==6.0 pytest-travis-fold==1.3.0 pytest-xvfb==1.1.0 PyVirtualDisplay==0.2.1 From 3e4bd7c35ca0db65b2d453bd42e2df6afb2e3e0a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:41:12 +0100 Subject: [PATCH 37/51] Update pytest-xvfb from 1.1.0 to 1.2.0 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index cb128a936..7ff6d0687 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -34,7 +34,7 @@ pytest-qt==3.2.2 pytest-repeat==0.7.0 pytest-rerunfailures==6.0 pytest-travis-fold==1.3.0 -pytest-xvfb==1.1.0 +pytest-xvfb==1.2.0 PyVirtualDisplay==0.2.1 six==1.12.0 vulture==1.0 From 9a0c517858492096c9d8a7180df41f4bf5e004a1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:41:14 +0100 Subject: [PATCH 38/51] Update tox from 3.6.1 to 3.7.0 --- misc/requirements/requirements-tox.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index 9827b9ce8..018f3823d 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -5,5 +5,5 @@ pluggy==0.8.1 py==1.7.0 six==1.12.0 toml==0.10.0 -tox==3.6.1 +tox==3.7.0 virtualenv==16.1.0 From be2d3624177ef96602c214c31ed93ba3748e15fb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 11 Feb 2019 19:41:16 +0100 Subject: [PATCH 39/51] Update virtualenv from 16.1.0 to 16.4.0 --- misc/requirements/requirements-tox.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index 018f3823d..47ea7a4e3 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -6,4 +6,4 @@ py==1.7.0 six==1.12.0 toml==0.10.0 tox==3.7.0 -virtualenv==16.1.0 +virtualenv==16.4.0 From 018d207941bad19bc92e8c4a8ce796d290bdf83a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 17:24:23 +0100 Subject: [PATCH 40/51] Update requirements-pyqt properly for Qt 5.12 --- misc/requirements/requirements-pyqt.txt | 3 ++- misc/requirements/requirements-pyqt.txt-raw | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt index 539b101ba..63722a679 100644 --- a/misc/requirements/requirements-pyqt.txt +++ b/misc/requirements/requirements-pyqt.txt @@ -1,4 +1,5 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py PyQt5==5.12 -PyQt5-sip==4.19.13 +PyQt5-sip==4.19.14 +PyQtWebEngine==5.12 diff --git a/misc/requirements/requirements-pyqt.txt-raw b/misc/requirements/requirements-pyqt.txt-raw index 37a69c45a..9c6afbf16 100644 --- a/misc/requirements/requirements-pyqt.txt-raw +++ b/misc/requirements/requirements-pyqt.txt-raw @@ -1 +1,2 @@ -PyQt5 \ No newline at end of file +PyQt5 +PyQtWebEngine From 62059c27f334ee4c6ce8fce30b0bbbd3094bad64 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 18:00:10 +0100 Subject: [PATCH 41/51] Use per-file-ignores built into the new flake8 --- .flake8 | 11 +++++------ misc/requirements/requirements-flake8.txt | 4 +--- misc/requirements/requirements-flake8.txt-raw | 1 - 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.flake8 b/.flake8 index 7a783a4b0..04c491bf2 100644 --- a/.flake8 +++ b/.flake8 @@ -46,12 +46,11 @@ ignore = min-version = 3.4.0 max-complexity = 12 per-file-ignores = - /qutebrowser/api/hook.py : N801 - /tests/**/*.py : D100,D101,D401 - /tests/unit/browser/test_history.py : N806 - /tests/helpers/fixtures.py : N806 - /tests/unit/browser/webkit/http/test_content_disposition.py : D400 - /scripts/dev/ci/appveyor_install.py : FI53 + qutebrowser/api/hook.py : N801 + tests/* : D100,D101 + tests/unit/browser/test_history.py : D100,D101,N806 + tests/helpers/fixtures.py : D100,D101,N806 + tests/unit/browser/webkit/http/test_content_disposition.py : D100,D101,D400 copyright-check = True copyright-regexp = # Copyright [\d-]+ .* copyright-min-file-size = 110 diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index a3606430d..6cdfac747 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -1,6 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py attrs==18.2.0 +entrypoints==0.3 flake8==3.7.5 flake8-bugbear==18.8.0 flake8-builtins==1.4.1 @@ -11,17 +12,14 @@ flake8-deprecated==1.3 flake8-docstrings==1.3.0 flake8-future-import==0.4.5 flake8-mock==0.3 -flake8-per-file-ignores==0.8.1 flake8-polyfill==1.0.2 flake8-string-format==0.2.3 flake8-tidy-imports==2.0.0 flake8-tuple==0.2.13 mccabe==0.6.1 -pathmatch==0.2.1 pep8-naming==0.8.2 pycodestyle==2.5.0 pydocstyle==3.0.0 pyflakes==2.1.0 six==1.12.0 snowballstemmer==1.2.1 -typing==3.6.6 diff --git a/misc/requirements/requirements-flake8.txt-raw b/misc/requirements/requirements-flake8.txt-raw index 1f30b83ae..1bdca6974 100644 --- a/misc/requirements/requirements-flake8.txt-raw +++ b/misc/requirements/requirements-flake8.txt-raw @@ -8,7 +8,6 @@ flake8-deprecated flake8-docstrings flake8-future-import flake8-mock -flake8-per-file-ignores flake8-string-format flake8-tidy-imports flake8-tuple From 7c87f4e3d0f394224d43b67966ba40a9860ac329 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 18:01:45 +0100 Subject: [PATCH 42/51] s/qApp/q_app/g --- qutebrowser/app.py | 62 +++++++++++++++---------------- qutebrowser/misc/consolewidget.py | 2 +- tests/unit/test_app.py | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 2b6896b76..ca0bc06a7 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -83,7 +83,7 @@ from qutebrowser.misc import utilcmds # pylint: enable=unused-import -qApp = None +q_app = None def run(args): @@ -101,25 +101,25 @@ def run(args): log.init.debug("Initializing config...") configinit.early_init(args) - global qApp - qApp = Application(args) - qApp.setOrganizationName("qutebrowser") - qApp.setApplicationName("qutebrowser") - qApp.setDesktopFileName("qutebrowser") - qApp.setApplicationVersion(qutebrowser.__version__) - qApp.lastWindowClosed.connect(quitter.on_last_window_closed) + global q_app + q_app = Application(args) + q_app.setOrganizationName("qutebrowser") + q_app.setApplicationName("qutebrowser") + q_app.setDesktopFileName("qutebrowser") + q_app.setApplicationVersion(qutebrowser.__version__) + q_app.lastWindowClosed.connect(quitter.on_last_window_closed) if args.version: print(version.version()) sys.exit(usertypes.Exit.ok) crash_handler = crashsignal.CrashHandler( - app=qApp, quitter=quitter, args=args, parent=qApp) + app=q_app, quitter=quitter, args=args, parent=q_app) crash_handler.activate() objreg.register('crash-handler', crash_handler) - signal_handler = crashsignal.SignalHandler(app=qApp, quitter=quitter, - parent=qApp) + signal_handler = crashsignal.SignalHandler(app=q_app, quitter=quitter, + parent=q_app) signal_handler.activate() objreg.register('signal-handler', signal_handler) @@ -151,7 +151,7 @@ def qt_mainloop(): WARNING: misc/crashdialog.py checks the stacktrace for this function name, so if this is changed, it should be changed there as well! """ - return qApp.exec_() + return q_app.exec_() def init(args, crash_handler): @@ -162,7 +162,7 @@ def init(args, crash_handler): crash_handler: The CrashHandler instance. """ log.init.debug("Starting init...") - qApp.setQuitOnLastWindowClosed(False) + q_app.setQuitOnLastWindowClosed(False) _init_icon() loader.init() @@ -175,12 +175,12 @@ def init(args, crash_handler): sys.exit(usertypes.Exit.err_init) log.init.debug("Initializing eventfilter...") - event_filter = EventFilter(qApp) - qApp.installEventFilter(event_filter) + event_filter = EventFilter(q_app) + q_app.installEventFilter(event_filter) objreg.register('event-filter', event_filter) log.init.debug("Connecting signals...") - qApp.focusChanged.connect(on_focus_changed) + q_app.focusChanged.connect(on_focus_changed) _process_args(args) @@ -207,7 +207,7 @@ def _init_icon(): if icon.isNull(): log.init.warning("Failed to load icon") else: - qApp.setWindowIcon(icon) + q_app.setWindowIcon(icon) def _process_args(args): @@ -220,7 +220,7 @@ def _process_args(args): window = mainwindow.MainWindow(private=None) if not args.nowindow: window.show() - qApp.setActiveWindow(window) + q_app.setActiveWindow(window) process_pos_args(args.command) _open_startpage() @@ -425,7 +425,7 @@ def _init_modules(args, crash_handler): crash_handler: The CrashHandler instance. """ log.init.debug("Initializing save manager...") - save_manager = savemanager.SaveManager(qApp) + save_manager = savemanager.SaveManager(q_app) objreg.register('save-manager', save_manager) configinit.late_init(save_manager) @@ -450,7 +450,7 @@ def _init_modules(args, crash_handler): sql.init(os.path.join(standarddir.data(), 'history.sqlite')) log.init.debug("Initializing web history...") - history.init(qApp) + history.init(q_app) except sql.SqlEnvironmentError as e: error.handle_fatal_exc(e, args, 'Error initializing SQL', pre_text='Error initializing SQL') @@ -464,31 +464,31 @@ def _init_modules(args, crash_handler): crash_handler.handle_segfault() log.init.debug("Initializing sessions...") - sessions.init(qApp) + sessions.init(q_app) log.init.debug("Initializing websettings...") websettings.init(args) log.init.debug("Initializing quickmarks...") - quickmark_manager = urlmarks.QuickmarkManager(qApp) + quickmark_manager = urlmarks.QuickmarkManager(q_app) objreg.register('quickmark-manager', quickmark_manager) log.init.debug("Initializing bookmarks...") - bookmark_manager = urlmarks.BookmarkManager(qApp) + bookmark_manager = urlmarks.BookmarkManager(q_app) objreg.register('bookmark-manager', bookmark_manager) log.init.debug("Initializing cookies...") - cookie_jar = cookies.CookieJar(qApp) - ram_cookie_jar = cookies.RAMCookieJar(qApp) + cookie_jar = cookies.CookieJar(q_app) + ram_cookie_jar = cookies.RAMCookieJar(q_app) objreg.register('cookie-jar', cookie_jar) objreg.register('ram-cookie-jar', ram_cookie_jar) log.init.debug("Initializing cache...") - diskcache = cache.DiskCache(standarddir.cache(), parent=qApp) + diskcache = cache.DiskCache(standarddir.cache(), parent=q_app) objreg.register('cache', diskcache) log.init.debug("Initializing downloads...") - download_manager = qtnetworkdownloads.DownloadManager(parent=qApp) + download_manager = qtnetworkdownloads.DownloadManager(parent=q_app) objreg.register('qtnetwork-download-manager', download_manager) log.init.debug("Initializing Greasemonkey...") @@ -735,7 +735,7 @@ class Quitter: def _shutdown(self, status, restart): # noqa """Second stage of shutdown.""" log.destroy.debug("Stage 2 of shutting down...") - if qApp is None: + if q_app is None: # No QApplication exists yet, so quit hard. sys.exit(status) # Remove eventfilter @@ -743,7 +743,7 @@ class Quitter: log.destroy.debug("Removing eventfilter...") event_filter = objreg.get('event-filter', None) if event_filter is not None: - qApp.removeEventFilter(event_filter) + q_app.removeEventFilter(event_filter) except AttributeError: pass # Close all windows @@ -792,7 +792,7 @@ class Quitter: session_manager.delete_autosave() # We use a singleshot timer to exit here to minimize the likelihood of # segfaults. - QTimer.singleShot(0, functools.partial(qApp.exit, status)) + QTimer.singleShot(0, functools.partial(q_app.exit, status)) class Application(QApplication): @@ -893,7 +893,7 @@ class EventFilter(QObject): Return: True if the event should be filtered, False if it's passed through. """ - if qApp.activeWindow() not in objreg.window_registry.values(): + if q_app.activeWindow() not in objreg.window_registry.values(): # Some other window (print dialog, etc.) is focused so we pass the # event through. return False diff --git a/qutebrowser/misc/consolewidget.py b/qutebrowser/misc/consolewidget.py index 661c7b805..46ce8becd 100644 --- a/qutebrowser/misc/consolewidget.py +++ b/qutebrowser/misc/consolewidget.py @@ -162,7 +162,7 @@ class ConsoleWidget(QWidget): namespace = { '__name__': '__console__', '__doc__': None, - 'qApp': QApplication.instance(), + 'q_app': QApplication.instance(), # We use parent as self here because the user "feels" the whole # console, not just the line edit. 'self': parent, diff --git a/tests/unit/test_app.py b/tests/unit/test_app.py index 3d7555bc4..9b2916ba8 100644 --- a/tests/unit/test_app.py +++ b/tests/unit/test_app.py @@ -30,7 +30,7 @@ def test_on_focus_changed_issue1484(monkeypatch, qapp, caplog): For some reason, Qt sometimes calls on_focus_changed() with a QBuffer as argument. Let's make sure we handle that gracefully. """ - monkeypatch.setattr(app, 'qApp', qapp) + monkeypatch.setattr(app, 'q_app', qapp) buf = QBuffer() app.on_focus_changed(buf, buf) From 2d996baea0612b782666d4f941ddd900f10d312b Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 19:01:38 +0100 Subject: [PATCH 43/51] Fix remaining new flake8 issues --- qutebrowser/config/configdata.py | 8 ++++---- qutebrowser/misc/checkpyver.py | 2 +- qutebrowser/utils/qtutils.py | 2 +- qutebrowser/utils/version.py | 2 +- tests/unit/completion/test_completionmodel.py | 2 +- tests/unit/misc/test_ipc.py | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index 61e35fd53..52100ae8a 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -91,15 +91,15 @@ def _parse_yaml_type( ) -> configtypes.BaseType: if isinstance(node, str): # e.g: - # type: Bool + # > type: Bool # -> create the type object without any arguments type_name = node kwargs = {} # type: typing.MutableMapping[str, typing.Any] elif isinstance(node, dict): # e.g: - # type: - # name: String - # none_ok: true + # > type: + # > name: String + # > none_ok: true # -> create the type object and pass arguments type_name = node.pop('name') kwargs = node diff --git a/qutebrowser/misc/checkpyver.py b/qutebrowser/misc/checkpyver.py index cf8e13810..641ccc5f8 100644 --- a/qutebrowser/misc/checkpyver.py +++ b/qutebrowser/misc/checkpyver.py @@ -31,7 +31,7 @@ except ImportError: # pragma: no cover try: # Python2 from Tkinter import Tk # type: ignore - import tkMessageBox as messagebox # type: ignore + import tkMessageBox as messagebox # type: ignore # noqa: N813 except ImportError: # Some Python without Tk Tk = None # type: ignore diff --git a/qutebrowser/utils/qtutils.py b/qutebrowser/utils/qtutils.py index 5373e76aa..520ced252 100644 --- a/qutebrowser/utils/qtutils.py +++ b/qutebrowser/utils/qtutils.py @@ -40,7 +40,7 @@ from PyQt5.QtCore import (qVersion, QEventLoop, QDataStream, QByteArray, try: from PyQt5.QtWebKit import qWebKitVersion except ImportError: # pragma: no cover - qWebKitVersion = None # type: ignore + qWebKitVersion = None # type: ignore # noqa: N816 MAXVALS = { diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index a52e31ed8..750a13383 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -42,7 +42,7 @@ from PyQt5.QtWidgets import QApplication try: from PyQt5.QtWebKit import qWebKitVersion except ImportError: # pragma: no cover - qWebKitVersion = None # type: ignore + qWebKitVersion = None # type: ignore # noqa: N816 try: from PyQt5.QtWebEngineWidgets import QWebEngineProfile diff --git a/tests/unit/completion/test_completionmodel.py b/tests/unit/completion/test_completionmodel.py index 24f5bdf0d..719a51016 100644 --- a/tests/unit/completion/test_completionmodel.py +++ b/tests/unit/completion/test_completionmodel.py @@ -41,7 +41,7 @@ def test_first_last_item(counts): cat = mock.Mock(spec=['layoutChanged', 'layoutAboutToBeChanged']) cat.rowCount = mock.Mock(return_value=c, spec=[]) model.add_category(cat) - data = [i for i, rowCount in enumerate(counts) if rowCount > 0] + data = [i for i, row_count in enumerate(counts) if row_count > 0] if not data: # with no items, first and last should be an invalid index assert not model.first_item().isValid() diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py index 29ca0ff9d..dd2efcbb1 100644 --- a/tests/unit/misc/test_ipc.py +++ b/tests/unit/misc/test_ipc.py @@ -98,7 +98,7 @@ class FakeSocket(QObject): _connect_successful: The value returned for waitForConnected(). """ - readyRead = pyqtSignal() + readyRead = pyqtSignal() # noqa: N815 disconnected = pyqtSignal() def __init__(self, *, error=QLocalSocket.UnknownSocketError, state=None, From 3fd7b58107181b1ff25323b873afdee50cd4d1bc Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 19:50:02 +0100 Subject: [PATCH 44/51] Fix pylint on CI For some reason, we get an error here on Travis but not locally. This happens even with the same Python/pylint/astroid versions... --- qutebrowser/browser/webkit/network/networkreply.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qutebrowser/browser/webkit/network/networkreply.py b/qutebrowser/browser/webkit/network/networkreply.py index c56fe2a9b..a9d27186f 100644 --- a/qutebrowser/browser/webkit/network/networkreply.py +++ b/qutebrowser/browser/webkit/network/networkreply.py @@ -34,8 +34,8 @@ class FixedDataNetworkReply(QNetworkReply): """QNetworkReply subclass for fixed data.""" - def __init__(self, request, fileData, mimeType, # noqa: N803 - parent=None): + def __init__(self, request, # noqa: N803 pylint: disable=invalid-name + fileData, mimeType, parent=None): """Constructor. Args: From b6a7fc59844722a9118646ceefd72f3115f95bc7 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 19:50:39 +0100 Subject: [PATCH 45/51] Update pytest warnings ignore We don't need the one for pytest-benchmark anymore, but we need one for pytest-bdd. See https://github.com/pytest-dev/pytest-bdd/pull/288 See #4511 --- pytest.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pytest.ini b/pytest.ini index c278b0591..ff2b606ef 100644 --- a/pytest.ini +++ b/pytest.ini @@ -70,5 +70,5 @@ filterwarnings = error # This happens in many qutebrowser dependencies... ignore:Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working:DeprecationWarning - # WORKAROUND for https://github.com/ionelmc/pytest-benchmark/issues/124 - ignore:Node\.warn\(code, message\) form has been deprecated, use Node\.warn\(warning_instance\) instead:pytest.PytestDeprecationWarning + # WORKAROUND for https://github.com/pytest-dev/pytest-bdd/pull/288 + ignore:the `pytest\.config` global is deprecated\. Please use `request.config` or `pytest_configure` \(if you're a pytest plugin\) instead\. From 94f998ac3a34bc068ed800e0718c248d94da8527 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 19:59:41 +0100 Subject: [PATCH 46/51] Adjust for new pytest import handling See #4511 --- tests/unit/components/test_adblock.py | 2 +- tests/unit/config/test_configtypes.py | 2 +- tests/unit/keyinput/test_keyutils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/components/test_adblock.py b/tests/unit/components/test_adblock.py index f37b57962..d63c802c8 100644 --- a/tests/unit/components/test_adblock.py +++ b/tests/unit/components/test_adblock.py @@ -30,7 +30,7 @@ from PyQt5.QtCore import QUrl from qutebrowser.components import adblock from qutebrowser.utils import urlmatch -from tests.helpers import utils +from helpers import utils pytestmark = pytest.mark.usefixtures('qapp') diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py index b0b85d997..78116be20 100644 --- a/tests/unit/config/test_configtypes.py +++ b/tests/unit/config/test_configtypes.py @@ -38,7 +38,7 @@ from qutebrowser.config import configtypes, configexc, configutils from qutebrowser.utils import debug, utils, qtutils, urlmatch from qutebrowser.browser.network import pac from qutebrowser.keyinput import keyutils -from tests.helpers import utils as testutils +from helpers import utils as testutils class Font(QFont): diff --git a/tests/unit/keyinput/test_keyutils.py b/tests/unit/keyinput/test_keyutils.py index d6e7bce34..f69d90446 100644 --- a/tests/unit/keyinput/test_keyutils.py +++ b/tests/unit/keyinput/test_keyutils.py @@ -26,7 +26,7 @@ from PyQt5.QtCore import Qt, QEvent, pyqtSignal from PyQt5.QtGui import QKeyEvent, QKeySequence from PyQt5.QtWidgets import QWidget -from tests.unit.keyinput import key_data +from unit.keyinput import key_data from qutebrowser.keyinput import keyutils from qutebrowser.utils import utils From 5a319cc50533c65629000a7e235d14a5e275c55f Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 20:10:29 +0100 Subject: [PATCH 47/51] Be more strict about Python deprecation warnings again The warnings caught in earlyinit.py got fixed in the affected dependencies. The collections.abc warning also seems to be fixed in everything but PyYAML. --- pytest.ini | 2 -- qutebrowser/misc/earlyinit.py | 20 +------------------- qutebrowser/utils/utils.py | 10 +++++++++- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/pytest.ini b/pytest.ini index ff2b606ef..49f23359b 100644 --- a/pytest.ini +++ b/pytest.ini @@ -68,7 +68,5 @@ qt_log_ignore = xfail_strict = true filterwarnings = error - # This happens in many qutebrowser dependencies... - ignore:Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working:DeprecationWarning # WORKAROUND for https://github.com/pytest-dev/pytest-bdd/pull/288 ignore:the `pytest\.config` global is deprecated\. Please use `request.config` or `pytest_configure` \(if you're a pytest plugin\) instead\. diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index 690ede60f..02e3564a2 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -199,25 +199,7 @@ def _check_modules(modules): for name, text in modules.items(): try: - # https://github.com/pallets/jinja/pull/628 - # https://bitbucket.org/birkenfeld/pygments-main/issues/1314/ - # https://github.com/pallets/jinja/issues/646 - # https://bitbucket.org/fdik/pypeg/commits/dd15ca462b532019c0a3be1d39b8ee2f3fa32f4e - messages = ['invalid escape sequence', - 'Flags not at the start of the expression'] - # pylint: disable=bad-continuation - with log.ignore_py_warnings( - category=DeprecationWarning, - message=r'({})'.format('|'.join(messages)) - ), log.ignore_py_warnings( - category=PendingDeprecationWarning, - module='imp' - ), log.ignore_py_warnings( - category=ImportWarning, - message=r'Not importing directory .*: missing __init__' - ): - # pylint: enable=bad-continuation - importlib.import_module(name) + importlib.import_module(name) except ImportError as e: _die(text, e) diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index 2d517043a..760bce576 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -655,7 +655,15 @@ def expand_windows_drive(path): def yaml_load(f): """Wrapper over yaml.load using the C loader if possible.""" start = datetime.datetime.now() - data = yaml.load(f, Loader=YamlLoader) + + # WORKAROUND for https://github.com/yaml/pyyaml/pull/181 + with log.ignore_py_warnings( + category=DeprecationWarning, + message=r"Using or importing the ABCs from 'collections' instead " + r"of from 'collections\.abc' is deprecated, and in 3\.8 it will " + r"stop working"): + data = yaml.load(f, Loader=YamlLoader) + end = datetime.datetime.now() delta = (end - start).total_seconds() From 22b58e011dcfa4d1407e8e9cdfa19b4e33977677 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 20:17:52 +0100 Subject: [PATCH 48/51] Update requirements --- misc/requirements/requirements-optional.txt | 1 - misc/requirements/requirements-tests.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-optional.txt b/misc/requirements/requirements-optional.txt index e0b5f0609..52d067f69 100644 --- a/misc/requirements/requirements-optional.txt +++ b/misc/requirements/requirements-optional.txt @@ -4,4 +4,3 @@ colorama==0.4.1 cssutils==1.0.2 hunter==2.2.1 Pympler==0.6 -six==1.12.0 diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 7ff6d0687..da28f08a0 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -37,5 +37,6 @@ pytest-travis-fold==1.3.0 pytest-xvfb==1.2.0 PyVirtualDisplay==0.2.1 six==1.12.0 +soupsieve==1.7.3 vulture==1.0 Werkzeug==0.14.1 From a001fd1099a174ef16441d5483252b3fcc1eaba6 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 20:19:59 +0100 Subject: [PATCH 49/51] Re-add some deprecation warning filters Turns out there never was a PyPEG2 release... --- qutebrowser/misc/earlyinit.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index 02e3564a2..a2db81764 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -199,7 +199,17 @@ def _check_modules(modules): for name, text in modules.items(): try: - importlib.import_module(name) + # https://bitbucket.org/fdik/pypeg/commits/dd15ca462b532019c0a3be1d39b8ee2f3fa32f4e + # pylint: disable=bad-continuation + with log.ignore_py_warnings( + category=DeprecationWarning, + message=r'invalid escape sequence' + ), log.ignore_py_warnings( + category=ImportWarning, + message=r'Not importing directory .*: missing __init__' + ): + # pylint: enable=bad-continuation + importlib.import_module(name) except ImportError as e: _die(text, e) From 9ce8e40a9026cb21a1be907be2b82bc5911cd85b Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 20:58:59 +0100 Subject: [PATCH 50/51] Fix flake8 again --- qutebrowser/browser/webkit/network/networkreply.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qutebrowser/browser/webkit/network/networkreply.py b/qutebrowser/browser/webkit/network/networkreply.py index a9d27186f..72e03b9eb 100644 --- a/qutebrowser/browser/webkit/network/networkreply.py +++ b/qutebrowser/browser/webkit/network/networkreply.py @@ -34,8 +34,8 @@ class FixedDataNetworkReply(QNetworkReply): """QNetworkReply subclass for fixed data.""" - def __init__(self, request, # noqa: N803 pylint: disable=invalid-name - fileData, mimeType, parent=None): + def __init__(self, request, # pylint: disable=invalid-name + fileData, mimeType, parent=None): # noqa: N803 """Constructor. Args: From b31e5642de0e158f4160796099af69e35ba1bf91 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Feb 2019 21:01:55 +0100 Subject: [PATCH 51/51] 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