From 99ea4b98e8ee691e181a4b1d20596569ab9f32c9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Mar 2018 17:13:15 +0100 Subject: [PATCH 01/12] Update flake8-builtins from 1.0.post0 to 1.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 f467fa474..64c9b83ce 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -3,7 +3,7 @@ attrs==17.4.0 flake8==3.5.0 flake8-bugbear==18.2.0 -flake8-builtins==1.0.post0 +flake8-builtins==1.1.0 flake8-comprehensions==1.4.1 flake8-copyright==0.2.0 flake8-debugger==3.1.0 From 5a26858e07c882bda43778cc81e444a0ce6a166c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Mar 2018 17:13:17 +0100 Subject: [PATCH 02/12] Update flake8-per-file-ignores from 0.5 to 0.6 --- 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 64c9b83ce..eaf8e3ef7 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.4 flake8-mock==0.3 -flake8-per-file-ignores==0.5 +flake8-per-file-ignores==0.6 flake8-polyfill==1.0.2 flake8-string-format==0.2.3 flake8-tidy-imports==1.1.0 From b77e43d74fd2455b6ca4a3390c99b769e87ef4b0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Mar 2018 17:13:18 +0100 Subject: [PATCH 03/12] Update setuptools from 38.5.2 to 39.0.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 4784f27df..31f1c27bf 100644 --- a/misc/requirements/requirements-pip.txt +++ b/misc/requirements/requirements-pip.txt @@ -3,6 +3,6 @@ appdirs==1.4.3 packaging==17.1 pyparsing==2.2.0 -setuptools==38.5.2 +setuptools==39.0.1 six==1.11.0 wheel==0.30.0 From 2d5d485dafd77a7c480e52655134e7820df2abb4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Mar 2018 17:13:20 +0100 Subject: [PATCH 04/12] Update github3.py from 0.9.6 to 1.0.1 --- misc/requirements/requirements-pylint-master.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint-master.txt b/misc/requirements/requirements-pylint-master.txt index 6364f0fcf..6d2f9f95e 100644 --- a/misc/requirements/requirements-pylint-master.txt +++ b/misc/requirements/requirements-pylint-master.txt @@ -3,7 +3,7 @@ -e git+https://github.com/PyCQA/astroid.git#egg=astroid certifi==2018.1.18 chardet==3.0.4 -github3.py==0.9.6 +github3.py==1.0.1 idna==2.6 isort==4.3.4 lazy-object-proxy==1.3.1 From 1f3fc756db14161a80b4024addc434343ac631a4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Mar 2018 17:13:22 +0100 Subject: [PATCH 05/12] Update github3.py from 0.9.6 to 1.0.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 de27257e1..87e7d7769 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -3,7 +3,7 @@ astroid==1.6.1 certifi==2018.1.18 chardet==3.0.4 -github3.py==0.9.6 +github3.py==1.0.1 idna==2.6 isort==4.3.4 lazy-object-proxy==1.3.1 From 650aa532cd094cef43943c8c08a132673d0139b2 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Mar 2018 17:13:23 +0100 Subject: [PATCH 06/12] Update astroid from 1.6.1 to 1.6.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 87e7d7769..6b3d581d0 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==1.6.1 +astroid==1.6.2 certifi==2018.1.18 chardet==3.0.4 github3.py==1.0.1 From 3b7e1b3fe2b24cd5753621211e9ba09bfe305f68 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Mar 2018 17:13:25 +0100 Subject: [PATCH 07/12] Update pylint from 1.8.2 to 1.8.3 --- 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 6b3d581d0..75ae02694 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -8,7 +8,7 @@ idna==2.6 isort==4.3.4 lazy-object-proxy==1.3.1 mccabe==0.6.1 -pylint==1.8.2 +pylint==1.8.3 ./scripts/dev/pylint_checkers requests==2.18.4 six==1.11.0 From 8eb4d1580580b9ccb49266acacd64abfbfa45ce2 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Mar 2018 17:13:26 +0100 Subject: [PATCH 08/12] Update hypothesis from 3.49.0 to 3.50.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 409ad4e33..a485b54a7 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -11,7 +11,7 @@ fields==5.0.0 Flask==0.12.2 glob2==0.6 hunter==2.0.2 -hypothesis==3.49.0 +hypothesis==3.50.0 itsdangerous==0.24 # Jinja2==2.10 Mako==1.0.7 From a374698693df698515c5046f5c29778484631cb5 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 20 Mar 2018 06:38:11 +0100 Subject: [PATCH 09/12] Fix lint --- qutebrowser/utils/debug.py | 3 ++- tests/unit/mainwindow/statusbar/test_textbase.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py index 06bdd2909..2868d8390 100644 --- a/qutebrowser/utils/debug.py +++ b/qutebrowser/utils/debug.py @@ -87,10 +87,11 @@ def log_signals(obj): return ret obj.__init__ = new_init - return obj else: connect_log_slot(obj) + return obj + def qenum_key(base, value, add_base=False, klass=None): """Convert a Qt Enum value to its key as a string. diff --git a/tests/unit/mainwindow/statusbar/test_textbase.py b/tests/unit/mainwindow/statusbar/test_textbase.py index c73a87831..9299e3a5f 100644 --- a/tests/unit/mainwindow/statusbar/test_textbase.py +++ b/tests/unit/mainwindow/statusbar/test_textbase.py @@ -63,7 +63,7 @@ def test_settext_empty(mocker, qtbot): autospec=True) label.setText('') - label.repaint.assert_called_with() + label.repaint.assert_called_with() # pylint: disable=no-member def test_resize(qtbot): @@ -92,7 +92,7 @@ def test_text_elide_none(mocker, qtbot): 'fontMetrics') label._update_elided_text(20) - assert not label.fontMetrics.called + assert not label.fontMetrics.called # pylint: disable=no-member def test_unset_text(qtbot): From 59602ec5b5e4c6a667928394df7343c6f41b9722 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 20 Mar 2018 06:49:46 +0100 Subject: [PATCH 10/12] requirements: Blacklist flake8-builtins 1.1.0 See https://github.com/gforcada/flake8-builtins/issues/19 --- misc/requirements/requirements-flake8.txt | 2 +- misc/requirements/requirements-flake8.txt-raw | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index eaf8e3ef7..90bb33f94 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -3,7 +3,7 @@ attrs==17.4.0 flake8==3.5.0 flake8-bugbear==18.2.0 -flake8-builtins==1.1.0 +flake8-builtins==1.0.post0 # rq.filter: != 1.1.0 flake8-comprehensions==1.4.1 flake8-copyright==0.2.0 flake8-debugger==3.1.0 diff --git a/misc/requirements/requirements-flake8.txt-raw b/misc/requirements/requirements-flake8.txt-raw index 1f30b83ae..291313930 100644 --- a/misc/requirements/requirements-flake8.txt-raw +++ b/misc/requirements/requirements-flake8.txt-raw @@ -1,6 +1,6 @@ flake8 flake8-bugbear -flake8-builtins +flake8-builtins!=1.1.0 flake8-comprehensions flake8-copyright flake8-debugger @@ -15,3 +15,5 @@ flake8-tuple pep8-naming pydocstyle pyflakes + +#@ filter: flake8-builtins != 1.1.0 \ No newline at end of file From 51318d66c84d30d6d071d571b2eb30bacb1912a4 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 20 Mar 2018 06:54:04 +0100 Subject: [PATCH 11/12] Fix ignore for new flake8-per-file-ignores release --- .flake8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.flake8 b/.flake8 index 5b0360ab7..8828a3aa8 100644 --- a/.flake8 +++ b/.flake8 @@ -44,7 +44,7 @@ ignore = min-version = 3.4.0 max-complexity = 12 per-file-ignores = - /tests/*/test_*.py : D100,D101,D401 + /tests/**/test_*.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 From f230fd3abb8dff2f00c6309fc1cb2c2bfdc62a4e Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 20 Mar 2018 06:59:57 +0100 Subject: [PATCH 12/12] Rebuild requirement files --- misc/requirements/requirements-flake8.txt | 2 ++ misc/requirements/requirements-pylint-master.txt | 2 +- misc/requirements/requirements-pylint.txt | 2 +- misc/requirements/requirements-tox.txt-raw | 3 --- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index 90bb33f94..5e8f557c1 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -17,9 +17,11 @@ flake8-string-format==0.2.3 flake8-tidy-imports==1.1.0 flake8-tuple==0.2.13 mccabe==0.6.1 +pathmatch==0.2.1 pep8-naming==0.5.0 pycodestyle==2.3.1 pydocstyle==2.1.1 pyflakes==1.6.0 six==1.11.0 snowballstemmer==1.2.1 +typing==3.6.4 diff --git a/misc/requirements/requirements-pylint-master.txt b/misc/requirements/requirements-pylint-master.txt index 6d2f9f95e..c5e1b20ed 100644 --- a/misc/requirements/requirements-pylint-master.txt +++ b/misc/requirements/requirements-pylint-master.txt @@ -9,10 +9,10 @@ isort==4.3.4 lazy-object-proxy==1.3.1 mccabe==0.6.1 -e git+https://github.com/PyCQA/pylint.git#egg=pylint +python-dateutil==2.7.0 ./scripts/dev/pylint_checkers requests==2.18.4 six==1.11.0 uritemplate==3.0.0 -uritemplate.py==3.0.2 urllib3==1.22 wrapt==1.10.11 diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 75ae02694..1827150cb 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -9,10 +9,10 @@ isort==4.3.4 lazy-object-proxy==1.3.1 mccabe==0.6.1 pylint==1.8.3 +python-dateutil==2.7.0 ./scripts/dev/pylint_checkers requests==2.18.4 six==1.11.0 uritemplate==3.0.0 -uritemplate.py==3.0.2 urllib3==1.22 wrapt==1.10.11 diff --git a/misc/requirements/requirements-tox.txt-raw b/misc/requirements/requirements-tox.txt-raw index 61e0c0849..053148f84 100644 --- a/misc/requirements/requirements-tox.txt-raw +++ b/misc/requirements/requirements-tox.txt-raw @@ -1,4 +1 @@ tox - -# The latest tox release still depends on pluggy < 0.4... -pluggy==0.4.0