Merge branch 'pyup-scheduled-update-2018-02-05'
This commit is contained in:
commit
e5771c785e
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
certifi==2018.1.18
|
certifi==2018.1.18
|
||||||
chardet==3.0.4
|
chardet==3.0.4
|
||||||
codecov==2.0.14
|
codecov==2.0.15
|
||||||
coverage==4.4.2
|
coverage==4.5
|
||||||
idna==2.6
|
idna==2.6
|
||||||
requests==2.18.4
|
requests==2.18.4
|
||||||
urllib3==1.22
|
urllib3==1.22
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
attrs==17.4.0
|
attrs==17.4.0
|
||||||
flake8==3.5.0
|
flake8==3.5.0
|
||||||
flake8-bugbear==17.12.0
|
flake8-bugbear==18.2.0
|
||||||
flake8-builtins==1.0.post0
|
flake8-builtins==1.0.post0
|
||||||
flake8-comprehensions==1.4.1
|
flake8-comprehensions==1.4.1
|
||||||
flake8-copyright==0.2.0
|
flake8-copyright==0.2.0
|
||||||
|
@ -3,6 +3,6 @@
|
|||||||
appdirs==1.4.3
|
appdirs==1.4.3
|
||||||
packaging==16.8
|
packaging==16.8
|
||||||
pyparsing==2.2.0
|
pyparsing==2.2.0
|
||||||
setuptools==38.4.0
|
setuptools==38.5.0
|
||||||
six==1.11.0
|
six==1.11.0
|
||||||
wheel==0.30.0
|
wheel==0.30.0
|
||||||
|
@ -5,7 +5,7 @@ certifi==2018.1.18
|
|||||||
chardet==3.0.4
|
chardet==3.0.4
|
||||||
github3.py==0.9.6
|
github3.py==0.9.6
|
||||||
idna==2.6
|
idna==2.6
|
||||||
isort==4.2.15
|
isort==4.3.2
|
||||||
lazy-object-proxy==1.3.1
|
lazy-object-proxy==1.3.1
|
||||||
mccabe==0.6.1
|
mccabe==0.6.1
|
||||||
-e git+https://github.com/PyCQA/pylint.git#egg=pylint
|
-e git+https://github.com/PyCQA/pylint.git#egg=pylint
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
# This file is automatically generated by scripts/dev/recompile_requirements.py
|
# This file is automatically generated by scripts/dev/recompile_requirements.py
|
||||||
|
|
||||||
astroid==1.6.0
|
astroid==1.6.1
|
||||||
certifi==2018.1.18
|
certifi==2018.1.18
|
||||||
chardet==3.0.4
|
chardet==3.0.4
|
||||||
github3.py==0.9.6
|
github3.py==0.9.6
|
||||||
idna==2.6
|
idna==2.6
|
||||||
isort==4.2.15
|
isort==4.3.2
|
||||||
lazy-object-proxy==1.3.1
|
lazy-object-proxy==1.3.1
|
||||||
mccabe==0.6.1
|
mccabe==0.6.1
|
||||||
pylint==1.8.1
|
pylint==1.8.2
|
||||||
./scripts/dev/pylint_checkers
|
./scripts/dev/pylint_checkers
|
||||||
requests==2.18.4
|
requests==2.18.4
|
||||||
six==1.11.0
|
six==1.11.0
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# This file is automatically generated by scripts/dev/recompile_requirements.py
|
# This file is automatically generated by scripts/dev/recompile_requirements.py
|
||||||
|
|
||||||
PyQt5==5.9.2
|
PyQt5==5.9
|
||||||
sip==4.19.6
|
sip==4.19.6
|
||||||
|
@ -5,13 +5,13 @@ beautifulsoup4==4.6.0
|
|||||||
cheroot==6.0.0
|
cheroot==6.0.0
|
||||||
click==6.7
|
click==6.7
|
||||||
# colorama==0.3.9
|
# colorama==0.3.9
|
||||||
coverage==4.4.2
|
coverage==4.5
|
||||||
EasyProcess==0.2.3
|
EasyProcess==0.2.3
|
||||||
fields==5.0.0
|
fields==5.0.0
|
||||||
Flask==0.12.2
|
Flask==0.12.2
|
||||||
glob2==0.6
|
glob2==0.6
|
||||||
hunter==2.0.2
|
hunter==2.0.2
|
||||||
hypothesis==3.44.21
|
hypothesis==3.44.25
|
||||||
itsdangerous==0.24
|
itsdangerous==0.24
|
||||||
# Jinja2==2.10
|
# Jinja2==2.10
|
||||||
Mako==1.0.7
|
Mako==1.0.7
|
||||||
@ -21,8 +21,8 @@ parse-type==0.4.2
|
|||||||
pluggy==0.6.0
|
pluggy==0.6.0
|
||||||
py==1.5.2
|
py==1.5.2
|
||||||
py-cpuinfo==3.3.0
|
py-cpuinfo==3.3.0
|
||||||
pytest==3.3.1 # rq.filter: != 3.3.2
|
pytest==3.4.0 # rq.filter: != 3.3.2
|
||||||
pytest-bdd==2.19.0
|
pytest-bdd==2.20.0
|
||||||
pytest-benchmark==3.1.1
|
pytest-benchmark==3.1.1
|
||||||
pytest-cov==2.5.1
|
pytest-cov==2.5.1
|
||||||
pytest-faulthandler==1.3.1
|
pytest-faulthandler==1.3.1
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
[pytest]
|
[pytest]
|
||||||
|
log_level = NOTSET
|
||||||
addopts = --strict -rfEw --faulthandler-timeout=90 --instafail --pythonwarnings error --benchmark-columns=Min,Max,Median
|
addopts = --strict -rfEw --faulthandler-timeout=90 --instafail --pythonwarnings error --benchmark-columns=Min,Max,Median
|
||||||
testpaths = tests
|
testpaths = tests
|
||||||
markers =
|
markers =
|
||||||
|
@ -22,7 +22,6 @@
|
|||||||
import logging
|
import logging
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import _pytest.logging
|
|
||||||
|
|
||||||
|
|
||||||
class LogFailHandler(logging.Handler):
|
class LogFailHandler(logging.Handler):
|
||||||
@ -40,17 +39,8 @@ class LogFailHandler(logging.Handler):
|
|||||||
if logger.name == 'messagemock':
|
if logger.name == 'messagemock':
|
||||||
return
|
return
|
||||||
|
|
||||||
for h in root_logger.handlers:
|
|
||||||
if isinstance(h, _pytest.logging.LogCaptureHandler):
|
|
||||||
capture_handler = h
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
# The LogCaptureHandler is not available anymore during fixture
|
|
||||||
# teardown, so we ignore logging messages emitted there..
|
|
||||||
return
|
|
||||||
|
|
||||||
if (logger.level == record.levelno or
|
if (logger.level == record.levelno or
|
||||||
capture_handler.level == record.levelno):
|
root_logger.level == record.levelno):
|
||||||
# caplog.at_level(...) was used with the level of this message,
|
# caplog.at_level(...) was used with the level of this message,
|
||||||
# i.e. it was expected.
|
# i.e. it was expected.
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user