From fdf280810bf3edb5b6624db9f88375bc0a3f1a0b Mon Sep 17 00:00:00 2001
From: Christophe Verclytte <1611574+chris-verclytte@users.noreply.github.com>
Date: Wed, 8 Jul 2020 21:08:41 +0200
Subject: [PATCH] Disable conflicting rule between black and pylint

See :
https://github.com/psf/black/issues/48
https://github.com/PyCQA/pylint/issues/289
---
 .pylintrc                | 3 ++-
 tests/lib/test_docker.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index eaa1a03..1251b86 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -138,7 +138,8 @@ disable=print-statement,
         xreadlines-attribute,
         deprecated-sys-function,
         exception-escape,
-        comprehension-escape
+        comprehension-escape,
+        bad-continuation
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
diff --git a/tests/lib/test_docker.py b/tests/lib/test_docker.py
index d24a17c..26ba45c 100644
--- a/tests/lib/test_docker.py
+++ b/tests/lib/test_docker.py
@@ -7,7 +7,7 @@
 import nestor_api.lib.docker as docker
 
 
-# pylint disable=no-self-use
+# pylint: disable=no-self-use
 class TestDockerLib(TestCase):
     @patch("nestor_api.lib.docker.has_docker_image", autospec=True)
     @patch("nestor_api.lib.docker.git", autospec=True)