config: make ConfigValue.origin kw-only

I am going to add another field, then it will start being ambiguous, so
make it kw-only to ensure clarity.

Author: bluetech

src/_pytest/config/findpaths.py

@@ -3,6 +3,7 @@
 from collections.abc import Iterable
 from collections.abc import Sequence
 from dataclasses import dataclass
+from dataclasses import KW_ONLY
 import os
 from pathlib import Path
 import sys
@@ -31,6 +32,7 @@ class ConfigValue:
     # str/list[str] during parsing to maintain compatibility with the rest of
     # the configuration system.
     value: str | list[str]
+    _: KW_ONLY
     origin: Literal["file", "override"]
 
 
@@ -61,7 +63,9 @@ def load_config_dict_from_file(
         iniconfig = _parse_ini_config(filepath)
 
         if "pytest" in iniconfig:
-            return {k: ConfigValue(v, "file") for k, v in iniconfig["pytest"].items()}
+            return {
+                k: ConfigValue(v, origin="file") for k, v in iniconfig["pytest"].items()
+            }
         else:
             # "pytest.ini" files are always the source of configuration, even if empty.
             if filepath.name == "pytest.ini":
@@ -73,7 +77,8 @@ def load_config_dict_from_file(
 
         if "tool:pytest" in iniconfig.sections:
             return {
-                k: ConfigValue(v, "file") for k, v in iniconfig["tool:pytest"].items()
+                k: ConfigValue(v, origin="file")
+                for k, v in iniconfig["tool:pytest"].items()
             }
         elif "pytest" in iniconfig.sections:
             # If a setup.cfg contains a "[pytest]" section, we raise a failure to indicate users that
@@ -101,7 +106,9 @@ def load_config_dict_from_file(
             def make_scalar(v: object) -> str | list[str]:
                 return v if isinstance(v, list) else str(v)
 
-            return {k: ConfigValue(make_scalar(v), "file") for k, v in result.items()}
+            return {
+                k: ConfigValue(make_scalar(v), origin="file") for k, v in result.items()
+            }
 
     return None
 
@@ -217,7 +224,7 @@ def parse_override_ini(override_ini: Sequence[str] | None) -> ConfigDict:
                 f"-o/--override-ini expects option=value style (got: {ini_config!r})."
             ) from e
         else:
-            overrides[key] = ConfigValue(user_ini_value, "override")
+            overrides[key] = ConfigValue(user_ini_value, origin="override")
     return overrides
 
 

testing/test_config.py

@@ -58,9 +58,9 @@ def test_getcfg_and_config(
             encoding="utf-8",
         )
         _, _, cfg, _ = locate_config(Path.cwd(), [sub])
-        assert cfg["name"] == ConfigValue("value", "file")
+        assert cfg["name"] == ConfigValue("value", origin="file")
         config = pytester.parseconfigure(str(sub))
-        assert config.inicfg["name"] == ConfigValue("value", "file")
+        assert config.inicfg["name"] == ConfigValue("value", origin="file")
 
     def test_setupcfg_uses_toolpytest_with_pytest(self, pytester: Pytester) -> None:
         p1 = pytester.makepyfile("def test(): pass")
@@ -1314,7 +1314,7 @@ def test_inifilename(self, tmp_path: Path) -> None:
 
         # this indicates this is the file used for getting configuration values
         assert config.inipath == inipath
-        assert config.inicfg.get("name") == ConfigValue("value", "file")
+        assert config.inicfg.get("name") == ConfigValue("value", origin="file")
         assert config.inicfg.get("should_not_be_set") is None
 
 
@@ -1808,7 +1808,7 @@ def test_with_ini(self, tmp_path: Path, name: str, contents: str) -> None:
         )
         assert rootpath == tmp_path
         assert parsed_inipath == inipath
-        assert ini_config["x"] == ConfigValue("10", "file")
+        assert ini_config["x"] == ConfigValue("10", origin="file")
 
     @pytest.mark.parametrize("name", ["setup.cfg", "tox.ini"])
     def test_pytestini_overrides_empty_other(self, tmp_path: Path, name: str) -> None:
@@ -1882,7 +1882,7 @@ def test_with_specific_inifile(
         )
         assert rootpath == tmp_path
         assert inipath == p
-        assert ini_config["x"] == ConfigValue("10", "file")
+        assert ini_config["x"] == ConfigValue("10", origin="file")
 
     def test_explicit_config_file_sets_rootdir(
         self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
@@ -2152,7 +2152,9 @@ def test_addopts_before_initini(
         monkeypatch.setenv("PYTEST_ADDOPTS", f"-o cache_dir={cache_dir}")
         config = _config_for_test
         config._preparse([], addopts=True)
-        assert config.inicfg.get("cache_dir") == ConfigValue(cache_dir, "override")
+        assert config.inicfg.get("cache_dir") == ConfigValue(
+            cache_dir, origin="override"
+        )
 
     def test_addopts_from_env_not_concatenated(
         self, monkeypatch: MonkeyPatch, _config_for_test
@@ -2190,7 +2192,9 @@ def test_override_ini_does_not_contain_paths(
         """Check that -o no longer swallows all options after it (#3103)"""
         config = _config_for_test
         config._preparse(["-o", "cache_dir=/cache", "/some/test/path"])
-        assert config.inicfg.get("cache_dir") == ConfigValue("/cache", "override")
+        assert config.inicfg.get("cache_dir") == ConfigValue(
+            "/cache", origin="override"
+        )
 
     def test_multiple_override_ini_options(self, pytester: Pytester) -> None:
         """Ensure a file path following a '-o' option does not generate an error (#3103)"""

testing/test_findpaths.py

@@ -25,13 +25,13 @@ def test_pytest_ini(self, tmp_path: Path) -> None:
         """[pytest] section in pytest.ini files is read correctly"""
         fn = tmp_path / "pytest.ini"
         fn.write_text("[pytest]\nx=1", encoding="utf-8")
-        assert load_config_dict_from_file(fn) == {"x": ConfigValue("1", "file")}
+        assert load_config_dict_from_file(fn) == {"x": ConfigValue("1", origin="file")}
 
     def test_custom_ini(self, tmp_path: Path) -> None:
         """[pytest] section in any .ini file is read correctly"""
         fn = tmp_path / "custom.ini"
         fn.write_text("[pytest]\nx=1", encoding="utf-8")
-        assert load_config_dict_from_file(fn) == {"x": ConfigValue("1", "file")}
+        assert load_config_dict_from_file(fn) == {"x": ConfigValue("1", origin="file")}
 
     def test_custom_ini_without_section(self, tmp_path: Path) -> None:
         """Custom .ini files without [pytest] section are not considered for configuration"""
@@ -49,7 +49,7 @@ def test_valid_cfg_file(self, tmp_path: Path) -> None:
         """Custom .cfg files with [tool:pytest] section are read correctly"""
         fn = tmp_path / "custom.cfg"
         fn.write_text("[tool:pytest]\nx=1", encoding="utf-8")
-        assert load_config_dict_from_file(fn) == {"x": ConfigValue("1", "file")}
+        assert load_config_dict_from_file(fn) == {"x": ConfigValue("1", origin="file")}
 
     def test_unsupported_pytest_section_in_cfg_file(self, tmp_path: Path) -> None:
         """.cfg files with [pytest] section are no longer supported and should fail to alert users"""
@@ -97,11 +97,11 @@ def test_valid_toml_file(self, tmp_path: Path) -> None:
             encoding="utf-8",
         )
         assert load_config_dict_from_file(fn) == {
-            "x": ConfigValue("1", "file"),
-            "y": ConfigValue("20.0", "file"),
-            "values": ConfigValue(["tests", "integration"], "file"),
-            "name": ConfigValue("foo", "file"),
-            "heterogeneous_array": ConfigValue([1, "str"], "file"),  # type: ignore[list-item]
+            "x": ConfigValue("1", origin="file"),
+            "y": ConfigValue("20.0", origin="file"),
+            "values": ConfigValue(["tests", "integration"], origin="file"),
+            "name": ConfigValue("foo", origin="file"),
+            "heterogeneous_array": ConfigValue([1, "str"], origin="file"),  # type: ignore[list-item]
         }