diff --git a/doc/whatsnew/fragments/8464.user_action b/doc/whatsnew/fragments/8464.user_action new file mode 100644 index 0000000000..a4845acc6c --- /dev/null +++ b/doc/whatsnew/fragments/8464.user_action @@ -0,0 +1,5 @@ +Following a deprecation period, it's no longer possible to use ``MASTER`` +or ``master`` as configuration section in ``setup.cfg`` or ``tox.ini``. It's bad practice +to not start sections titles with the tool name. Please use ``pylint.main`` instead. + +Refs #8464 diff --git a/pylint/config/config_file_parser.py b/pylint/config/config_file_parser.py index 019f9b7380..ebb74b42be 100644 --- a/pylint/config/config_file_parser.py +++ b/pylint/config/config_file_parser.py @@ -9,7 +9,6 @@ import configparser import os import sys -import warnings from pathlib import Path from typing import TYPE_CHECKING @@ -41,23 +40,13 @@ def _parse_ini_file(self, file_path: Path) -> tuple[dict[str, str], list[str]]: config_content: dict[str, str] = {} options: list[str] = [] + ini_file_with_sections = self._ini_file_with_sections(file_path) for section in parser.sections(): - if self._ini_file_with_sections(file_path) and not section.startswith( - "pylint" - ): - if section.lower() == "master": - # TODO: 3.0: Remove deprecated handling of master, only allow 'pylint.' sections - warnings.warn( - "The use of 'MASTER' or 'master' as configuration section for pylint " - "has been deprecated, as it's bad practice to not start sections titles " - "with the tool name. Please use 'pylint.main' instead.", - UserWarning, - ) - else: - continue - for opt, value in parser[section].items(): - config_content[opt] = value - options += [f"--{opt}", value] + if ini_file_with_sections and not section.startswith("pylint"): + continue + for option, value in parser[section].items(): + config_content[option] = value + options += [f"--{option}", value] return config_content, options @staticmethod diff --git a/tests/config/functional/setup_cfg/deprecate_master/setup.cfg b/tests/config/functional/setup_cfg/deprecate_master/setup.cfg deleted file mode 100644 index fd63816469..0000000000 --- a/tests/config/functional/setup_cfg/deprecate_master/setup.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Test the deprecation of MASTER -[MASTER] -persistent=no diff --git a/tests/config/functional/setup_cfg/deprecate_master/setup.result.json b/tests/config/functional/setup_cfg/deprecate_master/setup.result.json deleted file mode 100644 index b66b785988..0000000000 --- a/tests/config/functional/setup_cfg/deprecate_master/setup.result.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "persistent": false -}