summaryrefslogtreecommitdiffhomepage
path: root/setup.cfg
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2018-09-17 17:42:19 -0700
committerJeff Forcier <jeff@bitprophet.org>2018-09-17 17:42:19 -0700
commit20355d22ec4d674e7c0ae04ef72b3755f6306ba8 (patch)
treef3a016e1a38f913c994570e8ef9baca151b97d9b /setup.cfg
parent487ae193970c200549b75c391c65999909540d53 (diff)
parentf09a0d3853ab7848ed8cd16148ce95ff58e09e8a (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'setup.cfg')
-rw-r--r--setup.cfg11
1 files changed, 10 insertions, 1 deletions
diff --git a/setup.cfg b/setup.cfg
index 8cc271fe..bf86db42 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,5 +9,14 @@ omit = paramiko/_winapi.py
[flake8]
exclude = sites,.git,build,dist,demos,tests
-ignore = E124,E125,E128,E261,E301,E302,E303,E402
+# NOTE: W503, E203 are concessions to black 18.0b5 and could be reinstated
+# later if fixed on that end.
+ignore = E124,E125,E128,E261,E301,E302,E303,E402,E721,W503,E203
max-line-length = 79
+
+[tool:pytest]
+# We use pytest-relaxed just for its utils at the moment, so disable it at the
+# plugin level until we adapt test organization to really use it.
+addopts = -p no:relaxed
+# Loop on failure
+looponfailroots = tests paramiko