Merge branch 'pyup-scheduled-update-2018-03-19'
This commit is contained in:
commit
32145d579b
2
.flake8
2
.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
|
||||
|
@ -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.0.post0 # rq.filter: != 1.1.0
|
||||
flake8-comprehensions==1.4.1
|
||||
flake8-copyright==0.2.0
|
||||
flake8-debugger==3.1.0
|
||||
@ -11,15 +11,17 @@ 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
|
||||
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
|
||||
|
@ -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
|
@ -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
|
||||
|
@ -3,16 +3,16 @@
|
||||
-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
|
||||
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
|
||||
|
@ -1,18 +1,18 @@
|
||||
# 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==0.9.6
|
||||
github3.py==1.0.1
|
||||
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
|
||||
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
|
||||
|
@ -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
|
||||
|
@ -1,4 +1 @@
|
||||
tox
|
||||
|
||||
# The latest tox release still depends on pluggy < 0.4...
|
||||
pluggy==0.4.0
|
||||
|
@ -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.
|
||||
|
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user