Make the {project} placeholder available to repair-wheel-command

Author: arcondello

cibuildwheel/platforms/android.py

@@ -442,6 +442,7 @@ def repair_wheel(state: BuildState, built_wheel: Path) -> Path:
                 state.options.repair_command,
                 wheel=built_wheel,
                 dest_dir=repaired_wheel_dir,
+                package=state.options.package_dir,
                 project=".",
             ),
             env=state.build_env,

cibuildwheel/platforms/linux.py

@@ -323,6 +323,7 @@ def build_in_container(
                     build_options.repair_command,
                     wheel=built_wheel,
                     dest_dir=repaired_wheel_dir,
+                    package=container_package_dir,
                     project=container_project_path,
                 )
                 container.call(["sh", "-c", repair_command_prepared], env=env)

cibuildwheel/platforms/macos.py

@@ -528,6 +528,7 @@ def build(options: Options, tmp_path: Path) -> None:
                         wheel=built_wheel,
                         dest_dir=repaired_wheel_dir,
                         delocate_archs=delocate_archs,
+                        package=build_options.package_dir,
                         project=".",
                     )
                     shell(repair_command_prepared, env=env)

cibuildwheel/platforms/pyodide.py

@@ -443,6 +443,7 @@ def build(options: Options, tmp_path: Path) -> None:
                         build_options.repair_command,
                         wheel=built_wheel,
                         dest_dir=repaired_wheel_dir,
+                        package=build_options.package_dir,
                         project=".",
                     )
                     shell(repair_command_prepared, env=env)

cibuildwheel/platforms/windows.py

@@ -525,6 +525,7 @@ def build(options: Options, tmp_path: Path) -> None:
                         build_options.repair_command,
                         wheel=built_wheel,
                         dest_dir=repaired_wheel_dir,
+                        package=build_options.package_dir,
                         project=".",
                     )
                     shell(repair_command_prepared, env=env)

docs/options.md

@@ -906,7 +906,7 @@ The following placeholders must be used inside the command and will be replaced
 - `{dest_dir}` for the absolute path of the directory where to create the repaired wheel
 - `{delocate_archs}` (macOS only) comma-separated list of architectures in the wheel.
 
-You can use the `{project}` placeholder in your `repair-wheel-command` to the project root.
+You can use the `{package}` or `{project}` placeholders in your `repair-wheel-command` to refer to the package being built or the project root, respectively.
 
 The command is run in a shell, so you can run multiple commands like `cmd1 && cmd2`.
 

test/test_custom_repair_wheel.py

@@ -58,7 +58,7 @@ def test(tmp_path, capfd):
         assert result[0].startswith("spam-0.1.0-py2-none-")
 
 
-def test_project_placeholder(tmp_path, capfd):
+def test_package_placeholder(tmp_path, capfd):
     # Identical to the previous test with the additional assumption that the {project}
     # placeholder has been replaced correctly
 
@@ -70,6 +70,37 @@ def test_project_placeholder(tmp_path, capfd):
         pytest.raises(subprocess.CalledProcessError) if num_builds > 1 else does_not_raise()
     )
 
+    with expectation as exc_info:
+        result = utils.cibuildwheel_run(
+            project_dir,
+            add_env={
+                "CIBW_REPAIR_WHEEL_COMMAND": "python {package}/repair.py {wheel} {dest_dir}",
+            },
+        )
+
+    captured = capfd.readouterr()
+    if num_builds > 1:
+        assert exc_info is not None
+        assert "Build failed because a wheel named" in captured.err
+        assert exc_info.value.returncode == 6
+    else:
+        # We only produced one wheel (perhaps Pyodide)
+        # check that it has the right name
+        assert result[0].startswith("spam-0.1.0-py2-none-")
+
+
+def test_project_placeholder(tmp_path, capfd):
+    # Identical to the previous two tests with the additional assumption that the {package}
+    # placeholder has been replaced correctly
+
+    project_dir = tmp_path / "project"
+    basic_project.generate(project_dir)
+
+    num_builds = len(utils.cibuildwheel_get_build_identifiers(project_dir))
+    expectation = (
+        pytest.raises(subprocess.CalledProcessError) if num_builds > 1 else does_not_raise()
+    )
+
     with expectation as exc_info:
         result = utils.cibuildwheel_run(
             project_dir,