From f93eda04de4ae7a3ded269f97e145920e28e2b72 Mon Sep 17 00:00:00 2001 From: Joshua Cannon Date: Tue, 29 Mar 2022 14:55:40 -0500 Subject: [PATCH 1/3] Fix Pylint pyproject.toml check_content string --- src/python/pants/backend/python/lint/pylint/subsystem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/pants/backend/python/lint/pylint/subsystem.py b/src/python/pants/backend/python/lint/pylint/subsystem.py index be0f5872b7d..c21e8c434e2 100644 --- a/src/python/pants/backend/python/lint/pylint/subsystem.py +++ b/src/python/pants/backend/python/lint/pylint/subsystem.py @@ -142,7 +142,7 @@ def config_request(self, dirs: Iterable[str]) -> ConfigFilesRequest: specified_option_name=f"[{self.options_scope}].config", discovery=self.config_discovery, check_existence=[".pylinrc", *(os.path.join(d, "pylintrc") for d in ("", *dirs))], - check_content={"pyproject.toml": b"[tool.pylint]", "setup.cfg": b"[pylint."}, + check_content={"pyproject.toml": b"[tool.pylint", "setup.cfg": b"[pylint."}, ) @property From 8b45be832622b135c1c33b1f0003fb75ea6ea1b5 Mon Sep 17 00:00:00 2001 From: Joshua Cannon Date: Tue, 29 Mar 2022 14:56:58 -0500 Subject: [PATCH 2/3] Update subsystem.py --- src/python/pants/backend/python/lint/pylint/subsystem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/pants/backend/python/lint/pylint/subsystem.py b/src/python/pants/backend/python/lint/pylint/subsystem.py index c21e8c434e2..31a7f990bbd 100644 --- a/src/python/pants/backend/python/lint/pylint/subsystem.py +++ b/src/python/pants/backend/python/lint/pylint/subsystem.py @@ -142,7 +142,7 @@ def config_request(self, dirs: Iterable[str]) -> ConfigFilesRequest: specified_option_name=f"[{self.options_scope}].config", discovery=self.config_discovery, check_existence=[".pylinrc", *(os.path.join(d, "pylintrc") for d in ("", *dirs))], - check_content={"pyproject.toml": b"[tool.pylint", "setup.cfg": b"[pylint."}, + check_content={"pyproject.toml": b"[tool.pylint.", "setup.cfg": b"[pylint."}, ) @property From 08de481bf639fb896dbfa6bda0b07647e3425047 Mon Sep 17 00:00:00 2001 From: Joshua Cannon Date: Tue, 29 Mar 2022 15:13:49 -0500 Subject: [PATCH 3/3] Update src/python/pants/backend/python/lint/pylint/subsystem.py Co-authored-by: Stu Hood --- src/python/pants/backend/python/lint/pylint/subsystem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/pants/backend/python/lint/pylint/subsystem.py b/src/python/pants/backend/python/lint/pylint/subsystem.py index 31a7f990bbd..fbf33f804c1 100644 --- a/src/python/pants/backend/python/lint/pylint/subsystem.py +++ b/src/python/pants/backend/python/lint/pylint/subsystem.py @@ -141,7 +141,7 @@ def config_request(self, dirs: Iterable[str]) -> ConfigFilesRequest: specified=self.config, specified_option_name=f"[{self.options_scope}].config", discovery=self.config_discovery, - check_existence=[".pylinrc", *(os.path.join(d, "pylintrc") for d in ("", *dirs))], + check_existence=[".pylintrc", *(os.path.join(d, "pylintrc") for d in ("", *dirs))], check_content={"pyproject.toml": b"[tool.pylint.", "setup.cfg": b"[pylint."}, )