Merge branch 'dependabot/pip/pytest-6.2.4' into dependabot/pip/pylint…

…-2.9.6
Julius2342 · Aug 6, 2021 · 9b83cd8 · 9b83cd8
2 parents 55f51c0 + b5e8fcf
commit 9b83cd8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.pylintrc b/.pylintrc
@@ -2,7 +2,7 @@
 reports=no
 
 [MESSAGES CONTROL]
-disable=C0111,bad-continuation,duplicate-code,fixme,locally-disabled,too-few-public-methods,too-many-arguments,too-many-instance-attributes
+disable=E1101,C0111,bad-continuation,duplicate-code,fixme,locally-disabled,too-few-public-methods,too-many-arguments,too-many-instance-attributes
 
 [REPORTS]
 output-format=colorized

diff --git a/requirements/testing.txt b/requirements/testing.txt
@@ -5,7 +5,7 @@ flake8==3.9.2
 flake8-isort==2.8.0
 pydocstyle==6.1.1
 pylint==2.9.6
-pytest==5.4.2
+pytest==6.2.4
 pytest-cov==2.12.1
 pytest-timeout==1.3.4
 setuptools==57.4.0