diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index a6a3a165a..9207e3a58 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -419,7 +419,7 @@ def build_options(self, identifier: Optional[str]) -> BuildOptions: test_requires = self.reader.get("test-requires", sep=" ").split() test_extras = self.reader.get("test-extras", sep=",") build_verbosity_str = self.reader.get("build-verbosity") - container_engine = self.reader.get("container_engine") + container_engine = self.reader.get("container-engine") build_frontend: BuildFrontend if build_frontend_str == "build": diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index e8e3855a8..1b6edc0c7 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -92,9 +92,11 @@ def basis_container_kwargs(): # print("SETUP temp_test_dir = {!r}".format(temp_test_dir)) HAVE_DOCKER = bool(shutil.which("docker")) + HAVE_PODMAN = bool(shutil.which("podman")) + if HAVE_DOCKER: yield {"container_engine": "docker", "docker_image": DEFAULT_IMAGE} - HAVE_PODMAN = bool(shutil.which("podman")) + if HAVE_PODMAN: # Basic podman usage yield {"container_engine": "podman", "docker_image": DEFAULT_IMAGE}