From 96608404aaa2e96cf5e361a680ef5ff2843e49f6 Mon Sep 17 00:00:00 2001
From: Antti Kaihola <13725+akaihola@users.noreply.github.com>
Date: Sun, 28 Aug 2022 12:14:57 +0300
Subject: [PATCH 1/2] Update Pylint and remove `bad-continuation` skip

---
 .pylintrc              | 2 --
 CHANGES.rst            | 2 ++
 constraints-oldest.txt | 1 +
 setup.cfg              | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 .pylintrc

diff --git a/.pylintrc b/.pylintrc
deleted file mode 100644
index 6b837fcef..000000000
--- a/.pylintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-[MESSAGES CONTROL]
-disable = bad-continuation
diff --git a/CHANGES.rst b/CHANGES.rst
index 14a042ab3..16e122b6b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -15,6 +15,8 @@ Fixed
 - Ignore linter lines which refer to files outside the common root of paths on the
   command line. Fixes a failure when Pylint notifies about obsolete options in
   ``.pylintrc``.
+- For linting Darker's own code base, require Pylint 2.6.0 or newer. This avoids the
+  need to skip the obsolete ``bad-continuation`` check now removed from Pylint.
 
 
 1.5.0_ - 2022-04-23
diff --git a/constraints-oldest.txt b/constraints-oldest.txt
index cb964f065..d21f5b9ec 100644
--- a/constraints-oldest.txt
+++ b/constraints-oldest.txt
@@ -13,6 +13,7 @@ flake8-bugbear==22.1.11
 flake8-comprehensions==3.7.0
 mypy==0.940
 Pygments==2.4.0
+pylint==2.6.0
 pytest==6.2.0
 pytest-flake8==1.0.6
 pytest-isort==1.1.0
diff --git a/setup.cfg b/setup.cfg
index d2c8b4bde..e75407959 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -61,7 +61,7 @@ test =
     flake8-comprehensions>=3.7.0
     mypy>=0.940
     pygments
-    pylint
+    pylint>=2.6.0
     pytest>=6.2.0
     pytest-darker
     pytest-flake8>=1.0.6

From 2e03be9c877ccb1eec4ed08827353afa58a14840 Mon Sep 17 00:00:00 2001
From: Antti Kaihola <13725+akaihola@users.noreply.github.com>
Date: Sun, 28 Aug 2022 18:05:47 +0300
Subject: [PATCH 2/2] Update to Pylint 2.13.0 due to PVE-2022-45185

From `safety check`:

   Vulnerability ID: 45185
   Affected spec: <2.13.0
   ADVISORY: Pylint 2.13.0 fixes a crash when using the doc_params
     extension. https://github.com/PyCQA/pylint/issues/5322
   PVE-2022-45185
   For more information, please visit
   https://pyup.io/vulnerabilities/PVE-2022-45185/45185/
---
 constraints-oldest.txt | 2 +-
 setup.cfg              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/constraints-oldest.txt b/constraints-oldest.txt
index d21f5b9ec..90ea502c9 100644
--- a/constraints-oldest.txt
+++ b/constraints-oldest.txt
@@ -13,7 +13,7 @@ flake8-bugbear==22.1.11
 flake8-comprehensions==3.7.0
 mypy==0.940
 Pygments==2.4.0
-pylint==2.6.0
+pylint==2.13.0
 pytest==6.2.0
 pytest-flake8==1.0.6
 pytest-isort==1.1.0
diff --git a/setup.cfg b/setup.cfg
index e75407959..af22cd34c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -61,7 +61,7 @@ test =
     flake8-comprehensions>=3.7.0
     mypy>=0.940
     pygments
-    pylint>=2.6.0
+    pylint>=2.13.0
     pytest>=6.2.0
     pytest-darker
     pytest-flake8>=1.0.6