From 53b33014e4ef928cbb7e80896b09916127a9d49e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 6 Aug 2018 19:41:11 +0200 Subject: [PATCH 01/14] Update astroid from 2.0.1 to 2.0.2 --- 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 e78dfe2cc..73c87b9f1 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -1,6 +1,6 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -astroid==2.0.1 +astroid==2.0.2 certifi==2018.4.16 chardet==3.0.4 github3.py==1.1.0 From 7c991d7c5fe86b1977202bf3f1de82b756067db5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 6 Aug 2018 19:41:13 +0200 Subject: [PATCH 02/14] Update pylint from 2.0.1 to 2.1.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 73c87b9f1..116fd46d7 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -8,7 +8,7 @@ idna==2.7 isort==4.3.4 lazy-object-proxy==1.3.1 mccabe==0.6.1 -pylint==2.0.1 +pylint==2.1.1 python-dateutil==2.7.3 ./scripts/dev/pylint_checkers requests==2.19.1 From c2322eddfde43f299d33dab815bace2f7328a74b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 6 Aug 2018 19:41:14 +0200 Subject: [PATCH 03/14] Update cheroot from 6.3.3 to 6.4.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 8b2d61007..8e0d950f9 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -4,7 +4,7 @@ atomicwrites==1.1.5 attrs==18.1.0 backports.functools-lru-cache==1.5 beautifulsoup4==4.6.1 -cheroot==6.3.3 +cheroot==6.4.0 click==6.7 # colorama==0.3.9 coverage==4.5.1 From 985f0ff3f0478ff39782c40e9774058d84df6c0f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 6 Aug 2018 19:41:16 +0200 Subject: [PATCH 04/14] Update hypothesis from 3.66.14 to 3.66.30 --- 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 8e0d950f9..627e06bd7 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -13,7 +13,7 @@ fields==5.0.0 Flask==1.0.2 glob2==0.6 hunter==2.0.2 -hypothesis==3.66.14 +hypothesis==3.66.30 itsdangerous==0.24 # Jinja2==2.10 Mako==1.0.7 From 5efed1af4c6cd26ea14bc575e52d65b1efb80790 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 6 Aug 2018 19:41:17 +0200 Subject: [PATCH 05/14] Update more-itertools from 4.2.0 to 4.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 627e06bd7..73e6dbb2b 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -18,7 +18,7 @@ itsdangerous==0.24 # Jinja2==2.10 Mako==1.0.7 # MarkupSafe==1.0 -more-itertools==4.2.0 +more-itertools==4.3.0 parse==1.8.4 parse-type==0.4.2 pluggy==0.7.1 From 85b5edb02388e184d8d0879adecd37e6c79edfe1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 6 Aug 2018 19:41:19 +0200 Subject: [PATCH 06/14] Update pytest from 3.6.4 to 3.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 73e6dbb2b..c10d17f6a 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -24,7 +24,7 @@ parse-type==0.4.2 pluggy==0.7.1 py==1.5.4 py-cpuinfo==4.0.0 -pytest==3.6.4 +pytest==3.7.1 pytest-bdd==2.21.0 pytest-benchmark==3.1.1 pytest-cov==2.5.1 From 6854781256aec39a9614f2fc84aafceca39c22ad Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 6 Aug 2018 19:41:20 +0200 Subject: [PATCH 07/14] Update pytest-repeat from 0.5.0 to 0.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 c10d17f6a..177c6442c 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -32,7 +32,7 @@ pytest-faulthandler==1.5.0 pytest-instafail==0.4.0 pytest-mock==1.10.0 pytest-qt==3.0.0 -pytest-repeat==0.5.0 +pytest-repeat==0.6.0 pytest-rerunfailures==4.1 pytest-travis-fold==1.3.0 pytest-xvfb==1.1.0 From c15277dd5a0df01cbfc1764f620112f53adf45e7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 6 Aug 2018 19:41:22 +0200 Subject: [PATCH 08/14] Update vulture from 0.28 to 0.29 --- 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 177c6442c..02cc07cb2 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -38,5 +38,5 @@ pytest-travis-fold==1.3.0 pytest-xvfb==1.1.0 PyVirtualDisplay==0.2.1 six==1.11.0 -vulture==0.28 +vulture==0.29 Werkzeug==0.14.1 From 36348f872aa0fa24d18a5c27ff3f72d271df28d7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 6 Aug 2018 19:41:23 +0200 Subject: [PATCH 09/14] Update vulture from 0.28 to 0.29 --- misc/requirements/requirements-vulture.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-vulture.txt b/misc/requirements/requirements-vulture.txt index c8a26e83c..622527f5d 100644 --- a/misc/requirements/requirements-vulture.txt +++ b/misc/requirements/requirements-vulture.txt @@ -1,3 +1,3 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -vulture==0.28 +vulture==0.29 From aac0031ba7562d2eec9402d64e3cfce0b324c13e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 6 Aug 2018 19:41:25 +0200 Subject: [PATCH 10/14] Update tox from 3.1.2 to 3.1.3 --- 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 62a037934..bcec912e3 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -5,5 +5,5 @@ pluggy==0.7.1 py==1.5.4 pyparsing==2.2.0 six==1.11.0 -tox==3.1.2 +tox==3.1.3 virtualenv==16.0.0 From b617f1e03cb251b1d888d4f7c18304e3119916d2 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 6 Aug 2018 19:55:27 +0200 Subject: [PATCH 11/14] Remove old pylint disable comments --- qutebrowser/browser/webengine/webenginetab.py | 4 ++-- qutebrowser/config/configfiles.py | 2 +- qutebrowser/misc/miscwidgets.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 2ccb7d950..2c890b8a5 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -1090,10 +1090,10 @@ class WebEngineTab(browsertab.AbstractTab): # percent encoded content is 2 megabytes minus 30 bytes. self._widget.setHtml(html, base_url) - def networkaccessmanager(self): # pylint: disable=useless-return + def networkaccessmanager(self): return None - def user_agent(self): # pylint: disable=useless-return + def user_agent(self): return None def clear_ssl_errors(self): diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py index d0830dd72..a2c88d311 100644 --- a/qutebrowser/config/configfiles.py +++ b/qutebrowser/config/configfiles.py @@ -576,7 +576,7 @@ def read_autoconfig(): """Read the autoconfig.yml file.""" try: config.instance.read_yaml() - except configexc.ConfigFileErrors: # pylint: disable=try-except-raise + except configexc.ConfigFileErrors: raise # caught in outer block except configexc.Error as e: desc = configexc.ConfigErrorDesc("Error", e) diff --git a/qutebrowser/misc/miscwidgets.py b/qutebrowser/misc/miscwidgets.py index bc0afea24..eef127cf2 100644 --- a/qutebrowser/misc/miscwidgets.py +++ b/qutebrowser/misc/miscwidgets.py @@ -246,7 +246,7 @@ class WrapperLayout(QLayout): def sizeHint(self): return self._widget.sizeHint() - def itemAt(self, _index): # pylint: disable=useless-return + def itemAt(self, _index): return None def takeAt(self, _index): @@ -287,7 +287,7 @@ class PseudoLayout(QLayout): def count(self): return 0 - def itemAt(self, _pos): # pylint: disable=useless-return + def itemAt(self, _pos): return None def widget(self): From 70addc93b3c7c55bb2ca260d5efe0c3b6bee9c32 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 6 Aug 2018 19:57:38 +0200 Subject: [PATCH 12/14] Add missing yaml_value fixture --- tests/unit/config/test_configcommands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py index 343e7c8ca..77097d851 100644 --- a/tests/unit/config/test_configcommands.py +++ b/tests/unit/config/test_configcommands.py @@ -247,7 +247,7 @@ class TestCycle: commands.config_cycle(opt, '[foo]', '[bar]') assert config_stub.get(opt) == ['foo'] - def test_toggle(self, commands, config_stub): + def test_toggle(self, commands, config_stub, yaml_value): """Run ':config-cycle auto_save.session'. Should toggle the value. From 8dcc9963f761d061eb952eace91988302d7e92bb Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 6 Aug 2018 21:00:05 +0200 Subject: [PATCH 13/14] Update requirement files --- misc/requirements/requirements-pylint-master.txt | 1 - misc/requirements/requirements-pylint.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint-master.txt b/misc/requirements/requirements-pylint-master.txt index 2df073620..c27329fad 100644 --- a/misc/requirements/requirements-pylint-master.txt +++ b/misc/requirements/requirements-pylint-master.txt @@ -13,7 +13,6 @@ python-dateutil==2.7.3 ./scripts/dev/pylint_checkers requests==2.19.1 six==1.11.0 -typed-ast==1.1.0 uritemplate==3.0.0 urllib3==1.23 wrapt==1.10.11 diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 116fd46d7..b41257dc8 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -14,6 +14,7 @@ python-dateutil==2.7.3 requests==2.19.1 six==1.11.0 typed-ast==1.1.0 +typing==3.6.4 uritemplate==3.0.0 urllib3==1.23 wrapt==1.10.11 From 1232edbb228ffc544aec8043b675c09a4a9ad4d9 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 6 Aug 2018 21:01:44 +0200 Subject: [PATCH 14/14] Downgrade to pytest 3.6.4 See https://github.com/pytest-dev/pytest-bdd/issues/250 --- misc/requirements/requirements-tests.txt | 2 +- misc/requirements/requirements-tests.txt-raw | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 02cc07cb2..de8db988e 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -24,7 +24,7 @@ parse-type==0.4.2 pluggy==0.7.1 py==1.5.4 py-cpuinfo==4.0.0 -pytest==3.7.1 +pytest==3.6.4 # rq.filter: != 3.7, != 3.7.1 pytest-bdd==2.21.0 pytest-benchmark==3.1.1 pytest-cov==2.5.1 diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw index 121689980..d1109a418 100644 --- a/misc/requirements/requirements-tests.txt-raw +++ b/misc/requirements/requirements-tests.txt-raw @@ -4,7 +4,7 @@ coverage Flask hunter hypothesis -pytest +pytest<3.7 pytest-bdd pytest-benchmark pytest-cov @@ -19,3 +19,4 @@ pytest-xvfb vulture #@ ignore: Jinja2, MarkupSafe, colorama +#@ filter: pytest != 3.7, != 3.7.1