From fa7f01592b02229ff47f3bcab39a9b7d6c59f07c Mon Sep 17 00:00:00 2001
From: Joseph Young <80432516+jpy-git@users.noreply.github.com>
Date: Wed, 16 Mar 2022 17:00:30 +0000
Subject: [PATCH 1/1] Update pylint config docs (#2931)

---
 CHANGES.md                                    |  2 ++
 docs/compatible_configs/pylint/pylintrc       |  3 --
 docs/compatible_configs/pylint/pyproject.toml |  3 --
 docs/compatible_configs/pylint/setup.cfg      |  3 --
 docs/guides/using_black_with_other_tools.md   | 32 +++----------------
 5 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index da51e94..bb3ccb9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -32,6 +32,8 @@
 <!-- Major changes to documentation and policies. Small docs changes
      don't need a changelog entry. -->
 
+- Update pylint config documentation (#2931)
+
 ### Integrations
 
 <!-- For example, Docker, GitHub Actions, pre-commit, editors -->
diff --git a/docs/compatible_configs/pylint/pylintrc b/docs/compatible_configs/pylint/pylintrc
index 7abddd2..e863488 100644
--- a/docs/compatible_configs/pylint/pylintrc
+++ b/docs/compatible_configs/pylint/pylintrc
@@ -1,5 +1,2 @@
-[MESSAGES CONTROL]
-disable = C0330, C0326
-
 [format]
 max-line-length = 88
diff --git a/docs/compatible_configs/pylint/pyproject.toml b/docs/compatible_configs/pylint/pyproject.toml
index 49ad7a2..ef51f98 100644
--- a/docs/compatible_configs/pylint/pyproject.toml
+++ b/docs/compatible_configs/pylint/pyproject.toml
@@ -1,5 +1,2 @@
-[tool.pylint.messages_control]
-disable = "C0330, C0326"
-
 [tool.pylint.format]
 max-line-length = "88"
diff --git a/docs/compatible_configs/pylint/setup.cfg b/docs/compatible_configs/pylint/setup.cfg
index 3ada245..0b754cd 100644
--- a/docs/compatible_configs/pylint/setup.cfg
+++ b/docs/compatible_configs/pylint/setup.cfg
@@ -1,5 +1,2 @@
 [pylint]
 max-line-length = 88
-
-[pylint.messages_control]
-disable = C0330, C0326
diff --git a/docs/guides/using_black_with_other_tools.md b/docs/guides/using_black_with_other_tools.md
index bde99f7..1d380bd 100644
--- a/docs/guides/using_black_with_other_tools.md
+++ b/docs/guides/using_black_with_other_tools.md
@@ -210,31 +210,16 @@ mixed feelings about _Black_'s formatting style.
 #### Configuration
 
 ```
-disable = C0326, C0330
 max-line-length = 88
 ```
 
 #### Why those options above?
 
-When _Black_ is folding very long expressions, the closing brackets will
-[be dedented](../the_black_code_style/current_style.md#how-black-wraps-lines).
+Pylint should be configured to only complain about lines that surpass `88` characters
+via `max-line-length = 88`.
 
-```py3
-ImportantClass.important_method(
-    exc, limit, lookup_lines, capture_locals, callback
-)
-```
-
-Although this style is PEP 8 compliant, Pylint will raise
-`C0330: Wrong hanging indentation before block (add 4 spaces)` warnings. Since _Black_
-isn't configurable on this style, Pylint should be told to ignore these warnings via
-`disable = C0330`.
-
-Also, since _Black_ deals with whitespace around operators and brackets, Pylint's
-warning `C0326: Bad whitespace` should be disabled using `disable = C0326`.
-
-And as usual, Pylint should be configured to only complain about lines that surpass `88`
-characters via `max-line-length = 88`.
+If using `pylint<2.6.0`, also disable `C0326` and `C0330` as these are incompatible with
+_Black_ formatting and have since been removed.
 
 #### Formats
 
@@ -242,9 +227,6 @@ characters via `max-line-length = 88`.
 <summary>pylintrc</summary>
 
 ```ini
-[MESSAGES CONTROL]
-disable = C0326, C0330
-
 [format]
 max-line-length = 88
 ```
@@ -257,9 +239,6 @@ max-line-length = 88
 ```cfg
 [pylint]
 max-line-length = 88
-
-[pylint.messages_control]
-disable = C0326, C0330
 ```
 
 </details>
@@ -268,9 +247,6 @@ disable = C0326, C0330
 <summary>pyproject.toml</summary>
 
 ```toml
-[tool.pylint.messages_control]
-disable = "C0326, C0330"
-
 [tool.pylint.format]
 max-line-length = "88"
 ```
-- 
2.39.5