Remove merge_config_settings

Author: q0w

src/pip/_internal/cli/req_command.py

@@ -34,7 +34,6 @@
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.resolution.base import BaseResolver
 from pip._internal.self_outdated_check import pip_self_version_check
-from pip._internal.utils.misc import merge_config_settings
 from pip._internal.utils.temp_dir import (
     TempDirectory,
     TempDirectoryTypeRegistry,
@@ -435,21 +434,14 @@ def get_requirements(
             for parsed_req in parse_requirements(
                 filename, finder=finder, options=options, session=session
             ):
-                req_config_settings = (
-                    parsed_req.options.get("config_settings")
-                    if parsed_req.options
-                    else None
-                )
-                cli_config_settings = getattr(options, "config_settings", None)
-                config_settings = merge_config_settings(
-                    req_config_settings, cli_config_settings
-                )
                 req_to_add = install_req_from_parsed_requirement(
                     parsed_req,
                     isolated=options.isolated_mode,
                     use_pep517=options.use_pep517,
                     user_supplied=True,
-                    config_settings=config_settings,
+                    config_settings=parsed_req.options.get("config_settings")
+                    if parsed_req.options
+                    else None,
                 )
                 requirements.append(req_to_add)
 

src/pip/_internal/utils/misc.py

@@ -61,7 +61,6 @@
     "remove_auth_from_url",
     "check_externally_managed",
     "ConfiguredBuildBackendHookCaller",
-    "merge_config_settings",
 ]
 
 logger = logging.getLogger(__name__)
@@ -729,31 +728,3 @@ def prepare_metadata_for_build_editable(
             config_settings=cs,
             _allow_fallback=_allow_fallback,
         )
-
-
-def merge_config_settings(
-    reqs_settings: Optional[Dict[str, Union[str, List[str]]]],
-    cli_settings: Optional[Dict[str, Union[str, List[str]]]],
-) -> Optional[Dict[str, Union[str, List[str]]]]:
-    if not reqs_settings or not cli_settings:
-        return reqs_settings or cli_settings
-
-    dd: Dict[str, Union[str, List[str]]] = {}
-    for d in (reqs_settings, cli_settings):
-        for k, v in d.items():
-            if k in dd:
-                value = dd[k]
-                if isinstance(value, list):
-                    if isinstance(v, list):
-                        value.extend(v)
-                    else:
-                        value.append(v)
-                else:
-                    if isinstance(v, str):
-                        value = [value, v]
-                    else:
-                        value = [value, *v]
-                dd[k] = value
-            else:
-                dd[k] = v
-    return dd

tests/functional/test_config_settings.py

@@ -174,68 +174,11 @@ def test_install_config_reqs(script: PipTestEnvironment) -> None:
     )
     script.scratch_path.joinpath("reqs.txt").write_text(
         'foo --config-settings "--build-option=--cffi" '
-        '--config-settings "--build-option=--avx2"'
+        '--config-settings "--build-option=--avx2" '
+        "--config-settings FOO=BAR"
     )
     script.pip("install", "--no-index", "-f", str(a_sdist.parent), "-r", "reqs.txt")
     script.assert_installed(foo="1.0")
     config = script.site_packages_path / "config.json"
     with open(config, "rb") as f:
-        assert json.load(f) == {"--build-option": ["--cffi", "--avx2"]}
-
-
-def test_merge_cli_reqs_config_settings(script: PipTestEnvironment) -> None:
-    _, _, project_dir = make_project(script.scratch_path)
-    a_sdist = create_basic_sdist_for_package(
-        script,
-        "foo",
-        "1.0",
-        {"pyproject.toml": PYPROJECT_TOML, "backend/dummy_backend.py": BACKEND_SRC},
-    )
-    script.scratch_path.joinpath("reqs.txt").write_text(
-        'foo --config-settings "FOO=HELLO" --config-settings "FOO=BAR" '
-        '--config-settings "BAZ=BAR"'
-    )
-    script.pip(
-        "install",
-        "--no-index",
-        "-f",
-        str(a_sdist.parent),
-        "-r",
-        "reqs.txt",
-        "--config-settings",
-        "FOO=FOOBAR",
-        "--config-settings",
-        "FOO=BARFOO",
-    )
-    script.assert_installed(foo="1.0")
-    config = script.site_packages_path / "config.json"
-    with open(config, "rb") as f:
-        assert json.load(f) == {
-            "FOO": ["HELLO", "BAR", "FOOBAR", "BARFOO"],
-            "BAZ": "BAR",
-        }
-
-
-def test_cli_config_settings_reqs(script: PipTestEnvironment) -> None:
-    _, _, project_dir = make_project(script.scratch_path)
-    a_sdist = create_basic_sdist_for_package(
-        script,
-        "foo",
-        "1.0",
-        {"pyproject.toml": PYPROJECT_TOML, "backend/dummy_backend.py": BACKEND_SRC},
-    )
-    script.scratch_path.joinpath("reqs.txt").write_text("foo")
-    script.pip(
-        "install",
-        "--no-index",
-        "-f",
-        str(a_sdist.parent),
-        "-r",
-        "reqs.txt",
-        "--config-settings",
-        "FOO=BAR",
-    )
-    script.assert_installed(foo="1.0")
-    config = script.site_packages_path / "config.json"
-    with open(config, "rb") as f:
-        assert json.load(f) == {"FOO": "BAR"}
+        assert json.load(f) == {"--build-option": ["--cffi", "--avx2"], "FOO": "BAR"}