Support .coveragerc.toml for configuration

This patch provides a new configuration option for coverage.py.
Considering that many projects have switched to toml configurations,
this change offers a more flexible approach to manage coverage settings.

Author: OlenaYefymenko

coverage/config.py

@@ -587,6 +587,7 @@ def config_files_to_try(config_file: bool | str) -> list[tuple[str, bool, bool]]
     assert isinstance(config_file, str)
     files_to_try = [
         (config_file, True, specified_file),
+        (".coveragerc.toml", True, False),
         ("setup.cfg", False, False),
         ("tox.ini", False, False),
         ("pyproject.toml", False, False),

tests/test_config.py

@@ -33,7 +33,8 @@ def test_default_config(self) -> None:
 
     def test_arguments(self) -> None:
         # Arguments to the constructor are applied to the configuration.
-        cov = coverage.Coverage(timid=True, data_file="fooey.dat", concurrency="multiprocessing")
+        cov = coverage.Coverage(
+            timid=True, data_file="fooey.dat", concurrency="multiprocessing")
         assert cov.config.timid
         assert not cov.config.branch
         assert cov.config.data_file == "fooey.dat"
@@ -66,9 +67,10 @@ def test_named_config_file(self, file_class: FilePathType) -> None:
         assert not cov.config.branch
         assert cov.config.data_file == "delete.me"
 
-    def test_toml_config_file(self) -> None:
-        # A pyproject.toml file will be read into the configuration.
-        self.make_file("pyproject.toml", """\
+    @pytest.mark.parametrize("filename", ["pyproject.toml", ".coveragerc.toml"])
+    def test_toml_config_file(self, filename) -> None:
+        # A pyproject.toml and coveragerc.toml will be read into the configuration.
+        self.make_file(filename, """\
             # This is just a bogus toml file for testing.
             [tool.somethingelse]
             authors = ["Joe D'Ávila <[email protected]>"]
@@ -94,11 +96,13 @@ def test_toml_config_file(self) -> None:
         assert cov.config.precision == 3
         assert cov.config.html_title == "tabblo & «ταБЬℓσ»"
         assert cov.config.fail_under == 90.5
-        assert cov.config.get_plugin_options("plugins.a_plugin") == {"hello": "world"}
+        assert cov.config.get_plugin_options("plugins.a_plugin") == {
+            "hello": "world"}
 
-    def test_toml_ints_can_be_floats(self) -> None:
+    @pytest.mark.parametrize("filename", ["pyproject.toml", ".coveragerc.toml"])
+    def test_toml_ints_can_be_floats(self, filename) -> None:
         # Test that our class doesn't reject integers when loading floats
-        self.make_file("pyproject.toml", """\
+        self.make_file(filename, """\
             # This is just a bogus toml file for testing.
             [tool.coverage.report]
             fail_under = 90
@@ -214,6 +218,7 @@ def test_parse_errors(self, bad_config: str, msg: str) -> None:
         with pytest.raises(ConfigError, match=msg):
             coverage.Coverage()
 
+    @pytest.mark.parametrize("filename", ["pyproject.toml", ".coveragerc.toml"])
     @pytest.mark.parametrize("bad_config, msg", [
         ("[tool.coverage.run]\ntimid = \"maybe?\"\n", r"maybe[?]"),
         ("[tool.coverage.run\n", None),
@@ -237,9 +242,9 @@ def test_parse_errors(self, bad_config: str, msg: str) -> None:
         ("[tool.coverage.report]\nprecision=1.23", "not an integer"),
         ('[tool.coverage.report]\nfail_under="s"', "couldn't convert to a float"),
     ])
-    def test_toml_parse_errors(self, bad_config: str, msg: str) -> None:
+    def test_toml_parse_errors(self, filename, bad_config: str, msg: str) -> None:
         # Im-parsable values raise ConfigError, with details.
-        self.make_file("pyproject.toml", bad_config)
+        self.make_file(filename, bad_config)
         with pytest.raises(ConfigError, match=msg):
             coverage.Coverage()
 
@@ -263,11 +268,13 @@ def test_environment_vars_in_config(self) -> None:
         cov = coverage.Coverage()
         assert cov.config.data_file == "hello-world.fooey"
         assert cov.config.branch is True
-        assert cov.config.exclude_list == ["the_$one", "anotherZZZ", "xZZZy", "xy", "huh${X}what"]
+        assert cov.config.exclude_list == [
+            "the_$one", "anotherZZZ", "xZZZy", "xy", "huh${X}what"]
 
-    def test_environment_vars_in_toml_config(self) -> None:
+    @pytest.mark.parametrize("filename", ["pyproject.toml", ".coveragerc.toml"])
+    def test_environment_vars_in_toml_config(self, filename) -> None:
         # Config files can have $envvars in them.
-        self.make_file("pyproject.toml", """\
+        self.make_file(filename, """\
             [tool.coverage.run]
             data_file = "$DATA_FILE.fooey"
             branch = "$BRANCH"
@@ -296,7 +303,8 @@ def test_environment_vars_in_toml_config(self) -> None:
         assert cov.config.branch is True
         assert cov.config.precision == 3
         assert cov.config.data_file == "hello-world.fooey"
-        assert cov.config.exclude_list == ["the_$one", "anotherZZZ", "xZZZy", "xy", "huh${X}what"]
+        assert cov.config.exclude_list == [
+            "the_$one", "anotherZZZ", "xZZZy", "xy", "huh${X}what"]
 
     def test_tilde_in_config(self) -> None:
         # Config entries that are file paths can be tilde-expanded.
@@ -330,9 +338,10 @@ def test_tilde_in_config(self) -> None:
 
         self.assert_tilde_results()
 
-    def test_tilde_in_toml_config(self) -> None:
+    @pytest.mark.parametrize("filename", ["pyproject.toml", ".coveragerc.toml"])
+    def test_tilde_in_toml_config(self, filename) -> None:
         # Config entries that are file paths can be tilde-expanded.
-        self.make_file("pyproject.toml", """\
+        self.make_file(filename, """\
             [tool.coverage.run]
             data_file = "~/data.file"
 
@@ -384,7 +393,8 @@ def expanduser(s: str) -> str:
         assert cov.config.lcov_output == "/Users/me/lcov/~foo.lcov"
         assert cov.config.xml_output == "/Users/me/somewhere/xml.out"
         assert cov.config.exclude_list == ["~/data.file", "~joe/html_dir"]
-        assert cov.config.paths == {'mapping': ['/Users/me/src', '/Users/joe/source']}
+        assert cov.config.paths == {'mapping': [
+            '/Users/me/src', '/Users/joe/source']}
 
     def test_tweaks_after_constructor(self) -> None:
         # set_option can be used after construction to affect the config.
@@ -440,7 +450,8 @@ def test_tweak_error_checking(self) -> None:
     def test_tweak_plugin_options(self) -> None:
         # Plugin options have a more flexible syntax.
         cov = coverage.Coverage()
-        cov.set_option("run:plugins", ["fooey.plugin", "xyzzy.coverage.plugin"])
+        cov.set_option("run:plugins", [
+                       "fooey.plugin", "xyzzy.coverage.plugin"])
         cov.set_option("fooey.plugin:xyzzy", 17)
         cov.set_option("xyzzy.coverage.plugin:plugh", ["a", "b"])
         with pytest.raises(ConfigError, match="No such option: 'no_such.plugin:foo'"):
@@ -460,12 +471,13 @@ def test_unknown_option(self) -> None:
         with pytest.warns(CoverageWarning, match=msg):
             _ = coverage.Coverage()
 
-    def test_unknown_option_toml(self) -> None:
-        self.make_file("pyproject.toml", """\
+    @pytest.mark.parametrize("filename", ["pyproject.toml", ".coveragerc.toml"])
+    def test_unknown_option_toml(self, filename) -> None:
+        self.make_file(filename, """\
             [tool.coverage.run]
             xyzzy = 17
             """)
-        msg = r"Unrecognized option '\[tool.coverage.run\] xyzzy=' in config file pyproject.toml"
+        msg = f"Unrecognized option '\\[tool.coverage.run\\] xyzzy=' in config file {filename}"
         with pytest.warns(CoverageWarning, match=msg):
             _ = coverage.Coverage()
 
@@ -512,14 +524,16 @@ def test_exceptions_from_missing_things(self) -> None:
         with pytest.raises(ConfigError, match="No option 'foo' in section: 'xyzzy'"):
             config.get("xyzzy", "foo")
 
-    def test_exclude_also(self) -> None:
-        self.make_file("pyproject.toml", """\
+    @pytest.mark.parametrize("filename", ["pyproject.toml", ".coveragerc.toml"])
+    def test_exclude_also(self, filename) -> None:
+        self.make_file(filename, """\
             [tool.coverage.report]
             exclude_also = ["foobar", "raise .*Error"]
             """)
         cov = coverage.Coverage()
 
-        expected = coverage.config.DEFAULT_EXCLUDE + ["foobar", "raise .*Error"]
+        expected = coverage.config.DEFAULT_EXCLUDE + \
+            ["foobar", "raise .*Error"]
         assert cov.config.exclude_list == expected
 
     def test_partial_also(self) -> None:
@@ -529,7 +543,8 @@ def test_partial_also(self) -> None:
             """)
         cov = coverage.Coverage()
 
-        expected = coverage.config.DEFAULT_PARTIAL + ["foobar", "raise .*Error"]
+        expected = coverage.config.DEFAULT_PARTIAL + \
+            ["foobar", "raise .*Error"]
         assert cov.config.partial_list == expected
 
     def test_core_option(self) -> None:
@@ -672,10 +687,12 @@ def assert_config_settings_are_correct(self, cov: Coverage) -> None:
         assert cov.config.source_dirs == ["cooldir"]
         assert cov.config.disable_warnings == ["abcd", "efgh"]
 
-        assert cov.get_exclude_list() == ["if 0:", r"pragma:?\s+no cover", "another_tab"]
+        assert cov.get_exclude_list() == [
+            "if 0:", r"pragma:?\s+no cover", "another_tab"]
         assert cov.config.ignore_errors
         assert cov.config.run_omit == ["twenty"]
-        assert cov.config.report_omit == ["one", "another", "some_more", "yet_more"]
+        assert cov.config.report_omit == [
+            "one", "another", "some_more", "yet_more"]
         assert cov.config.report_include == ["thirty"]
         assert cov.config.precision == 3
 
@@ -719,7 +736,8 @@ def check_config_file_settings_in_other_file(self, fname: str, contents: str) ->
         self.assert_config_settings_are_correct(cov)
 
     def test_config_file_settings_in_setupcfg(self) -> None:
-        self.check_config_file_settings_in_other_file("setup.cfg", self.SETUP_CFG)
+        self.check_config_file_settings_in_other_file(
+            "setup.cfg", self.SETUP_CFG)
 
     def test_config_file_settings_in_toxini(self) -> None:
         self.check_config_file_settings_in_other_file("tox.ini", self.TOX_INI)
@@ -732,10 +750,12 @@ def check_other_config_if_coveragerc_specified(self, fname: str, contents: str)
         self.assert_config_settings_are_correct(cov)
 
     def test_config_file_settings_in_setupcfg_if_coveragerc_specified(self) -> None:
-        self.check_other_config_if_coveragerc_specified("setup.cfg", self.SETUP_CFG)
+        self.check_other_config_if_coveragerc_specified(
+            "setup.cfg", self.SETUP_CFG)
 
     def test_config_file_settings_in_tox_if_coveragerc_specified(self) -> None:
-        self.check_other_config_if_coveragerc_specified("tox.ini", self.TOX_INI)
+        self.check_other_config_if_coveragerc_specified(
+            "tox.ini", self.TOX_INI)
 
     def check_other_not_read_if_coveragerc(self, fname: str) -> None:
         """Check config `fname` is not read if .coveragerc exists."""
@@ -839,35 +859,38 @@ def test_no_toml_installed_explicit_toml(self) -> None:
                 coverage.Coverage(config_file="cov.toml")
 
     @pytest.mark.skipif(env.PYVERSION >= (3, 11), reason="Python 3.11 has toml in stdlib")
-    def test_no_toml_installed_pyproject_toml(self) -> None:
-        # Can't have coverage config in pyproject.toml without toml installed.
-        self.make_file("pyproject.toml", """\
+    @pytest.mark.parametrize("filename", ["pyproject.toml", ".coveragerc.toml"])
+    def test_no_toml_installed_pyproject_toml(self, filename) -> None:
+        # Can't have coverage config in pyproject.toml and .coveragerc.toml without toml installed.
+        self.make_file(filename, """\
             # A toml file!
             [tool.coverage.run]
             xyzzy = 17
             """)
         with mock.patch.object(coverage.tomlconfig, "has_tomllib", False):
-            msg = "Can't read 'pyproject.toml' without TOML support"
+            msg = "Can't read '{filename}' without TOML support"
             with pytest.raises(ConfigError, match=msg):
                 coverage.Coverage()
 
     @pytest.mark.skipif(env.PYVERSION >= (3, 11), reason="Python 3.11 has toml in stdlib")
-    def test_no_toml_installed_pyproject_toml_shorter_syntax(self) -> None:
+    @pytest.mark.parametrize("filename", ["pyproject.toml", ".coveragerc.toml"])
+    def test_no_toml_installed_pyproject_toml_shorter_syntax(self, filename) -> None:
         # Can't have coverage config in pyproject.toml without toml installed.
-        self.make_file("pyproject.toml", """\
+        self.make_file(filename, """\
             # A toml file!
             [tool.coverage]
             run.parallel = true
             """)
         with mock.patch.object(coverage.tomlconfig, "has_tomllib", False):
-            msg = "Can't read 'pyproject.toml' without TOML support"
+            msg = "Can't read '{filename}' without TOML support"
             with pytest.raises(ConfigError, match=msg):
                 coverage.Coverage()
 
     @pytest.mark.skipif(env.PYVERSION >= (3, 11), reason="Python 3.11 has toml in stdlib")
-    def test_no_toml_installed_pyproject_no_coverage(self) -> None:
+    @pytest.mark.parametrize("filename", ["pyproject.toml", ".coveragerc.toml"])
+    def test_no_toml_installed_pyproject_no_coverage(self, filename) -> None:
         # It's ok to have non-coverage pyproject.toml without toml installed.
-        self.make_file("pyproject.toml", """\
+        self.make_file(filename, """\
             # A toml file!
             [tool.something]
             xyzzy = 17
@@ -879,16 +902,38 @@ def test_no_toml_installed_pyproject_no_coverage(self) -> None:
             assert not cov.config.branch
             assert cov.config.data_file == ".coverage"
 
-    def test_exceptions_from_missing_toml_things(self) -> None:
-        self.make_file("pyproject.toml", """\
+    @pytest.mark.parametrize("filename", ["pyproject.toml", ".coveragerc.toml"])
+    def test_exceptions_from_missing_toml_things(self, filename) -> None:
+        self.make_file(filename, """\
             [tool.coverage.run]
             branch = true
             """)
         config = TomlConfigParser(False)
-        config.read("pyproject.toml")
+        config.read(filename)
         with pytest.raises(ConfigError, match="No section: 'xyzzy'"):
             config.options("xyzzy")
         with pytest.raises(ConfigError, match="No section: 'xyzzy'"):
             config.get("xyzzy", "foo")
         with pytest.raises(ConfigError, match="No option 'foo' in section: 'tool.coverage.run'"):
             config.get("run", "foo")
+
+    def test_coveragerc_toml_priority(self) -> None:
+        """Test that .coveragerc.toml has priority over pyproject.toml."""
+        self.make_file(".coveragerc.toml", """\
+            [tool.coverage.run]
+            timid = true
+            data_file = ".toml-data.dat"
+            branch = true
+            """)
+
+        self.make_file("pyproject.toml", """\
+            [tool.coverage.run]
+            timid = false
+            data_file = "pyproject-data.dat"
+            branch = false
+            """)
+        cov = coverage.Coverage()
+
+        assert cov.config.timid is True
+        assert cov.config.data_file == ".toml-data.dat"
+        assert cov.config.branch is True