Only pass --build-option to bdist_wheel in build_meta (#4079)

pypa · Nov 20, 2023 · 3aec9c6 · 3aec9c6
2 parents 30b8a88 + b599a45
commit 3aec9c6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/newsfragments/4079.removal.rst b/newsfragments/4079.removal.rst
@@ -0,0 +1,4 @@
+Removed handling of ``--config-settings["--build-option"]`` in ``setuptools.build_meta``
+from build-backend API hooks *other than* ``build_wheel``.
+This was motivate by `errors caused when passing this option
+<https://github.com/pypa/setuptools/issues/2491#issuecomment-1742859314>`_.
diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
@@ -289,7 +289,6 @@ def _get_build_requires(self, config_settings, requirements):
             *sys.argv[:1],
             *self._global_args(config_settings),
             "egg_info",
-            *self._arbitrary_args(config_settings),
         ]
         try:
             with Distribution.patch():
@@ -377,14 +376,14 @@ def _build_with_temp_dir(
         # Build in a temporary directory, then copy to the target.
         os.makedirs(result_directory, exist_ok=True)
         temp_opts = {"prefix": ".tmp-", "dir": result_directory}
+
         with tempfile.TemporaryDirectory(**temp_opts) as tmp_dist_dir:
             sys.argv = [
                 *sys.argv[:1],
                 *self._global_args(config_settings),
                 *setup_command,
                 "--dist-dir",
                 tmp_dist_dir,
-                *self._arbitrary_args(config_settings),
             ]
             with no_install_setup_requires():
                 self.run_setup()
@@ -403,7 +402,10 @@ def build_wheel(
     ):
         with suppress_known_deprecation():
             return self._build_with_temp_dir(
-                ['bdist_wheel'], '.whl', wheel_directory, config_settings
+                ['bdist_wheel', *self._arbitrary_args(config_settings)],
+                '.whl',
+                wheel_directory,
+                config_settings,
             )
 
     def build_sdist(self, sdist_directory, config_settings=None):

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
@@ -720,13 +720,7 @@ def test_editable_without_config_settings(self, tmpdir_cwd):
         build_backend.build_editable("temp")
         assert not Path("build").exists()
 
-    @pytest.mark.parametrize(
-        "config_settings",
-        [
-            {"--build-option": ["--mode", "strict"]},
-            {"editable-mode": "strict"},
-        ],
-    )
+    @pytest.mark.parametrize("config_settings", [{"editable-mode": "strict"}])
     def test_editable_with_config_settings(self, tmpdir_cwd, config_settings):
         path.build({**self._simple_pyproject_example, '_meta': {}})
         assert not Path("build").exists()