Skip to content

Commit

Permalink
Merge branch 'new_podman_support' of github.com:Erotemic/cibuildwheel…
Browse files Browse the repository at this point in the history
… into new_podman_support
  • Loading branch information
Erotemic committed Dec 22, 2021
2 parents b685755 + 05874f2 commit a50a6fd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 1 addition & 3 deletions cibuildwheel/docker_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,7 @@ def copy_out(self, from_path: PurePath, to_path: Path) -> None:
env=self.env,
)

command = (
f"{self.container_engine} cp {self.name}:/tmp/output-{self.name}.tar output-{self.name}.tar"
)
command = f"{self.container_engine} cp {self.name}:/tmp/output-{self.name}.tar output-{self.name}.tar"
subprocess.run(
command,
shell=True,
Expand Down
4 changes: 3 additions & 1 deletion cibuildwheel/linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,9 @@ def build(options: Options) -> None:
build_opts = options.build_options(None)
try:
# check docker is installed
subprocess.run([build_opts.container_engine, "--version"], check=True, stdout=subprocess.DEVNULL)
subprocess.run(
[build_opts.container_engine, "--version"], check=True, stdout=subprocess.DEVNULL
)
except Exception:
print(
f"cibuildwheel: {build_opts.container_engine} not found. An OCI exe like Docker or Podman is required to run Linux builds "
Expand Down

0 comments on commit a50a6fd

Please sign in to comment.