From df317a9000f61065ce55244b1f7ea05408cf45d8 Mon Sep 17 00:00:00 2001 From: joncrall Date: Thu, 16 Jun 2022 18:11:59 -0400 Subject: [PATCH 01/41] Flattened podman support commits --- .github/install_latest_podman.sh | 12 ++ .github/workflows/test.yml | 7 + cibuildwheel/docker_container.py | 132 +++++++++++++++-- cibuildwheel/linux.py | 9 +- cibuildwheel/options.py | 3 + cibuildwheel/resources/defaults.toml | 2 + setup.py | 1 + unit_test/conftest.py | 2 +- unit_test/docker_container_test.py | 214 ++++++++++++++++++++++++--- 9 files changed, 339 insertions(+), 43 deletions(-) create mode 100755 .github/install_latest_podman.sh diff --git a/.github/install_latest_podman.sh b/.github/install_latest_podman.sh new file mode 100755 index 00000000..42eca8b9 --- /dev/null +++ b/.github/install_latest_podman.sh @@ -0,0 +1,12 @@ +#!/bin/bash +__doc__=" +Based on code in: https://github.com/redhat-actions/podman-login/blob/main/.github/install_latest_podman.sh +" +# https://podman.io/getting-started/installation +# shellcheck source=/dev/null +. /etc/os-release +echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list +curl -sSfL "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key" | sudo apt-key add - +sudo apt-get update +sudo apt-get -y upgrade +sudo apt-get -y install podman diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a588b526..63f3f5d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,6 +45,13 @@ jobs: with: python-version: ${{ matrix.python_version }} + # Install podman on this CI instance for podman tests on linux + # Snippet from: https://github.com/redhat-actions/podman-login/blob/main/.github/workflows/example.yml + - name: Install latest podman + if: runner.os == 'Linux' + run: | + bash .github/install_latest_podman.sh + - name: Install dependencies run: | python -m pip install ".[test]" diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index 9dc3ab70..ff57b78d 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -1,4 +1,5 @@ import io +import os import json import platform import shlex @@ -25,6 +26,18 @@ class DockerContainer: A bash shell is running in the remote container. When `call()` is invoked, the command is relayed to the remote shell, and the results are streamed back to cibuildwheel. + + TODO: + - [ ] Rename to Container as this now generalizes docker and podman? + + Example: + >>> from cibuildwheel.docker_container import * # NOQA + >>> docker_image = "quay.io/pypa/manylinux2014_x86_64:2020-05-17-2f8ac3b" + >>> # Test the default container + >>> with DockerContainer(docker_image=docker_image) as self: + ... self.call(["echo", "hello world"]) + ... self.call(["cat", "/proc/1/cgroup"]) + ... print(self.get_environment()) """ UTILITY_PYTHON = "/opt/python/cp38-cp38/bin/python" @@ -34,7 +47,13 @@ class DockerContainer: bash_stdout: IO[bytes] def __init__( - self, *, docker_image: str, simulate_32_bit: bool = False, cwd: Optional[PathOrStr] = None + self, + *, + docker_image: str, + simulate_32_bit: bool = False, + cwd: Optional[PathOrStr] = None, + container_engine: str = "docker", + env: Optional[Dict[str, str]] = None, ): if not docker_image: raise ValueError("Must have a non-empty docker image to run.") @@ -43,10 +62,12 @@ class DockerContainer: self.simulate_32_bit = simulate_32_bit self.cwd = cwd self.name: Optional[str] = None + self.container_engine = container_engine + self.env = env # If specified, overwrite environment variables def __enter__(self) -> "DockerContainer": + self.name = f"cibuildwheel-{uuid.uuid4()}" - cwd_args = ["-w", str(self.cwd)] if self.cwd else [] # work-around for Travis-CI PPC64le Docker runs since 2021: # this avoids network splits @@ -57,24 +78,27 @@ class DockerContainer: network_args = ["--network=host"] shell_args = ["linux32", "/bin/bash"] if self.simulate_32_bit else ["/bin/bash"] + subprocess.run( [ - "docker", + self.container_engine, "create", "--env=CIBUILDWHEEL", f"--name={self.name}", "--interactive", - "--volume=/:/host", # ignored on CircleCI *network_args, - *cwd_args, + # Z-flags is for SELinux + "--volume=/:/host:Z", # ignored on CircleCI self.docker_image, *shell_args, ], + env=self.env, check=True, ) + self.process = subprocess.Popen( [ - "docker", + self.container_engine, "start", "--attach", "--interactive", @@ -82,6 +106,7 @@ class DockerContainer: ], stdin=subprocess.PIPE, stdout=subprocess.PIPE, + env=self.env, ) assert self.process.stdin and self.process.stdout @@ -89,7 +114,13 @@ class DockerContainer: self.bash_stdout = self.process.stdout # run a noop command to block until the container is responding - self.call(["/bin/true"]) + self.call(["/bin/true"], cwd="") + + if self.cwd: + # Although `docker create -w` does create the working dir if it + # does not exist, podman does not. There does not seem to be a way + # to setup a workdir for a container running in podman. + self.call(["mkdir", "-p", str(self.cwd)], cwd="") return self @@ -106,10 +137,20 @@ class DockerContainer: self.bash_stdin.close() self.bash_stdout.close() + if self.container_engine == "podman": + # This works around what seems to be a race condition in the podman + # backend. The full reason is not understood. See PR #966 for a + # discussion on possible causes and attempts to remove this line. + # For now, this seems to work "well enough". + self.process.wait() + assert isinstance(self.name, str) subprocess.run( - ["docker", "rm", "--force", "-v", self.name], stdout=subprocess.DEVNULL, check=False + [self.container_engine, "rm", "--force", "-v", self.name], + stdout=subprocess.DEVNULL, + env=self.env, + check=False, ) self.name = None @@ -122,15 +163,16 @@ class DockerContainer: if from_path.is_dir(): self.call(["mkdir", "-p", to_path]) subprocess.run( - f"tar cf - . | docker exec -i {self.name} tar --no-same-owner -xC {shell_quote(to_path)} -f -", + f"tar cf - . | {self.container_engine} exec -i {self.name} tar --no-same-owner -xC {shell_quote(to_path)} -f -", shell=True, check=True, cwd=from_path, + env=self.env, ) else: with subprocess.Popen( [ - "docker", + "{self.container_engine}", "exec", "-i", str(self.name), @@ -138,6 +180,7 @@ class DockerContainer: "-c", f"cat > {shell_quote(to_path)}", ], + env=self.env, stdin=subprocess.PIPE, ) as docker: docker.stdin = cast(IO[bytes], docker.stdin) @@ -155,12 +198,47 @@ class DockerContainer: # note: we assume from_path is a dir to_path.mkdir(parents=True, exist_ok=True) - subprocess.run( - f"docker exec -i {self.name} tar -cC {shell_quote(from_path)} -f - . | tar -xf -", - shell=True, - check=True, - cwd=to_path, - ) + if self.container_engine == "podman": + # The copy out logic that works for docker does not seem to + # translate to podman, which seems to need the steps spelled out + # more explicitly. + command = f"{self.container_engine} exec -i {self.name} tar -cC {shell_quote(from_path)} -f /tmp/output-{self.name}.tar ." + subprocess.run( + command, + shell=True, + check=True, + cwd=to_path, + env=self.env, + ) + + command = f"{self.container_engine} cp {self.name}:/tmp/output-{self.name}.tar output-{self.name}.tar" + subprocess.run( + command, + shell=True, + check=True, + cwd=to_path, + env=self.env, + ) + command = f"tar -xvf output-{self.name}.tar" + subprocess.run( + command, + shell=True, + check=True, + cwd=to_path, + env=self.env, + ) + os.unlink(to_path / f"output-{self.name}.tar") + elif self.container_engine == "docker": + command = f"{self.container_engine} exec -i {self.name} tar -cC {shell_quote(from_path)} -f - . | tar -xf -" + subprocess.run( + command, + shell=True, + check=True, + cwd=to_path, + env=self.env, + ) + else: + raise KeyError(self.container_engine) def glob(self, path: PurePosixPath, pattern: str) -> List[PurePosixPath]: glob_pattern = path.joinpath(pattern) @@ -186,6 +264,11 @@ class DockerContainer: cwd: Optional[PathOrStr] = None, ) -> str: + if cwd is None: + # Podman does not start the a container in a specific working dir + # so we always need to specify it when making calls. + cwd = self.cwd + chdir = f"cd {cwd}" if cwd else "" env_assignments = ( " ".join(f"{shlex.quote(k)}={shlex.quote(v)}" for k, v in env.items()) @@ -271,6 +354,23 @@ class DockerContainer: # used as an EnvironmentExecutor to evaluate commands and capture output return self.call(command, env=environment, capture_output=True) + def debug_info(self) -> str: + if self.container_engine == "podman": + command = f"{self.container_engine} info --debug" + else: + command = f"{self.container_engine} info" + completed = subprocess.run( + command, + shell=True, + check=True, + cwd=self.cwd, + env=self.env, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + ) + output = str(completed.stdout, encoding="utf8", errors="surrogateescape") + return output + def shell_quote(path: PurePath) -> str: return shlex.quote(str(path)) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 93225c21..e89a35b6 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -320,12 +320,16 @@ def build_on_docker( def build(options: Options, tmp_path: Path) -> None: # pylint: disable=unused-argument + + build_opts = options.build_options(None) try: # check docker is installed - subprocess.run(["docker", "--version"], check=True, stdout=subprocess.DEVNULL) + subprocess.run( + [build_opts.container_engine, "--version"], check=True, stdout=subprocess.DEVNULL + ) except subprocess.CalledProcessError: print( - "cibuildwheel: Docker not found. Docker is required to run Linux builds. " + f"cibuildwheel: {build_opts.container_engine} not found. An OCI exe like Docker or Podman is required to run Linux builds " "If you're building on Travis CI, add `services: [docker]` to your .travis.yml." "If you're building on Circle CI in Linux, add a `setup_remote_docker` step to your .circleci/config.yml", file=sys.stderr, @@ -355,6 +359,7 @@ def build(options: Options, tmp_path: Path) -> None: # pylint: disable=unused-a docker_image=build_step.docker_image, simulate_32_bit=build_step.platform_tag.endswith("i686"), cwd=container_project_path, + container_engine=build_opts.container_engine, ) as docker: build_on_docker( diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index 5d9744af..80ee5327 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -79,6 +79,7 @@ class BuildOptions(NamedTuple): test_extras: str build_verbosity: int build_frontend: BuildFrontend + container_engine: str @property def package_dir(self) -> Path: @@ -422,6 +423,7 @@ class Options: 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") build_frontend: BuildFrontend if build_frontend_str == "build": @@ -520,6 +522,7 @@ class Options: manylinux_images=manylinux_images or None, musllinux_images=musllinux_images or None, build_frontend=build_frontend, + container_engine=container_engine, ) def check_for_invalid_configuration(self, identifiers: List[str]) -> None: diff --git a/cibuildwheel/resources/defaults.toml b/cibuildwheel/resources/defaults.toml index 5890c8ed..5e0bdacf 100644 --- a/cibuildwheel/resources/defaults.toml +++ b/cibuildwheel/resources/defaults.toml @@ -19,6 +19,8 @@ before-test = "" test-requires = [] test-extras = [] +container-engine = "docker" + manylinux-x86_64-image = "manylinux2014" manylinux-i686-image = "manylinux2014" manylinux-aarch64-image = "manylinux2014" diff --git a/setup.py b/setup.py index 7a9eee68..ad32d3f3 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,7 @@ extras = { "pytest-timeout", "pytest-xdist", "build", + "toml", ], "bin": [ "click", diff --git a/unit_test/conftest.py b/unit_test/conftest.py index 2f794a21..4e22853a 100644 --- a/unit_test/conftest.py +++ b/unit_test/conftest.py @@ -16,7 +16,7 @@ def pytest_configure(config): def pytest_collection_modifyitems(config, items): if config.getoption("--run-docker"): - # --run-docker given in cli: do not skip docker tests + # --run-docker given in cli: do not skip container tests return skip_docker = pytest.mark.skip(reason="need --run-docker option to run") for item in items: diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index e9c43e77..dd317ee2 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -1,11 +1,15 @@ +import atexit +import os import platform import random import shutil import subprocess +import tempfile import textwrap from pathlib import Path, PurePath, PurePosixPath import pytest +import toml # type: ignore[import] from cibuildwheel.docker_container import DockerContainer from cibuildwheel.environment import EnvironmentAssignmentBash @@ -21,23 +25,178 @@ elif pm == "ppc64le": DEFAULT_IMAGE = "quay.io/pypa/manylinux2014_ppc64le:2020-05-17-2f8ac3b" elif pm == "s390x": DEFAULT_IMAGE = "quay.io/pypa/manylinux2014_s390x:2020-05-17-2f8ac3b" +else: + DEFAULT_IMAGE = "" + + +temp_test_dir = None + + +@atexit.register +def _cleanup_tempdir(): + """ + Cleans up any configuration written by :func:`basis_container_kwargs`. + + For podman tests, the user is not given write permissions by default in new + directories. As a workaround chown them before trying to delete them. + + It may be possible to handle this more cleanly in pytest itself, but using + atexit works well enough for now. + """ + import stat + + global temp_test_dir + if temp_test_dir is not None: + print(f"CLEANUP temp_test_dir = {temp_test_dir!r}") # type: ignore[unreachable] + for r, ds, fs in os.walk(temp_test_dir.name): + for d in ds: + dpath = os.path.join(r, d) + if not os.path.islink(dpath): + perms = os.lstat(dpath).st_mode + try: + os.chmod(dpath, stat.S_IWUSR | perms) + except Exception as ex: + print(f"issue with dpath = {dpath!r}, {ex!r}") + + for f in fs: + fpath = os.path.join(r, f) + if not os.path.islink(fpath): + perms = os.lstat(fpath).st_mode + try: + os.chmod(fpath, stat.S_IWUSR | perms) + except Exception as ex: + print(f"issue with fpath = {fpath!r}, {ex!r}") + else: + os.unlink(fpath) + try: + temp_test_dir.cleanup() + except Exception as ex: + print(f"Issue cleaning up ex = {ex!r}") + temp_test_dir = None + + +def basis_container_kwargs(): + """ + Generate keyword args that can be passed to to :class:`DockerContainer`. + + This is used with :func:`pytest.mark.parametrize` to run each test with + different configuraions of each supported containers engine. + + For docker we test the default configuration. + + For podman we test the default configuration and a configuration with VFS + (virtual file system) enabled as the storage driver. + """ + + global temp_test_dir + if temp_test_dir is None: + # Only setup the temp directory once for all tests + temp_test_dir = tempfile.TemporaryDirectory(prefix="cibw_test_") + + HAVE_DOCKER = bool(shutil.which("docker")) + HAVE_PODMAN = bool(shutil.which("podman")) + + if HAVE_DOCKER: + # Basic podman configuration + yield {"container_engine": "docker", "docker_image": DEFAULT_IMAGE} + + if HAVE_PODMAN: + # Basic podman usage + yield {"container_engine": "podman", "docker_image": DEFAULT_IMAGE} + + # VFS Podman usage (for the podman in docker use-case) + dpath = Path(temp_test_dir.name) + + # This requires that we write configuration files and point to them + # with environment variables before we run podman + # https://github.com/containers/common/blob/main/docs/containers.conf.5.md + vfs_containers_conf_data = { + "containers": { + "default_capabilities": [ + "CHOWN", + "DAC_OVERRIDE", + "FOWNER", + "FSETID", + "KILL", + "NET_BIND_SERVICE", + "SETFCAP", + "SETGID", + "SETPCAP", + "SETUID", + "SYS_CHROOT", + ] + }, + "engine": {"cgroup_manager": "cgroupfs", "events_logger": "file"}, + } + # https://github.com/containers/storage/blob/main/docs/containers-storage.conf.5.md + storage_root = dpath / ".local/share/containers/vfs-storage" + run_root = dpath / ".local/share/containers/vfs-runroot" + storage_root.mkdir(parents=True, exist_ok=True) + run_root.mkdir(parents=True, exist_ok=True) + vfs_containers_storage_conf_data = { + "storage": { + "driver": "vfs", + "graphroot": str(storage_root), + "runroot": str(run_root), + "rootless_storage_path": str(storage_root), + "options": { + # "remap-user": "containers", + "aufs": {"mountopt": "rw"}, + "overlay": {"mountopt": "rw", "force_mask": "shared"}, + # "vfs": {"ignore_chown_errors": "true"}, + }, + } + } + vfs_containers_conf_fpath = dpath / "temp_vfs_containers.conf" + vfs_containers_storage_conf_fpath = dpath / "temp_vfs_containers_storage.conf" + with open(vfs_containers_conf_fpath, "w") as file: + toml.dump(vfs_containers_conf_data, file) + + with open(vfs_containers_storage_conf_fpath, "w") as file: + toml.dump(vfs_containers_storage_conf_data, file) + + oci_environ = os.environ.copy() + oci_environ.update( + { + "CONTAINERS_CONF": str(vfs_containers_conf_fpath), + "CONTAINERS_STORAGE_CONF": str(vfs_containers_storage_conf_fpath), + } + ) + + yield { + "container_engine": "podman", + "docker_image": DEFAULT_IMAGE, + "env": oci_environ, + } @pytest.mark.docker -def test_simple(): - with DockerContainer(docker_image=DEFAULT_IMAGE) as container: +@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) +def test_simple(container_kwargs): + with DockerContainer(**container_kwargs) as container: assert container.call(["echo", "hello"], capture_output=True) == "hello\n" @pytest.mark.docker -def test_no_lf(): - with DockerContainer(docker_image=DEFAULT_IMAGE) as container: +@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) +def test_no_lf(container_kwargs): + with DockerContainer(**container_kwargs) as container: assert container.call(["printf", "hello"], capture_output=True) == "hello" @pytest.mark.docker -def test_environment(): - with DockerContainer(docker_image=DEFAULT_IMAGE) as container: +@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) +def test_debug_info(container_kwargs): + container = DockerContainer(**container_kwargs) + print(container.debug_info()) + with container: + pass + + +@pytest.mark.docker +@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) +def test_environment(container_kwargs): + with DockerContainer(**container_kwargs) as container: assert ( container.call( ["sh", "-c", "echo $TEST_VAR"], env={"TEST_VAR": "1"}, capture_output=True @@ -47,40 +206,43 @@ def test_environment(): @pytest.mark.docker -def test_cwd(): - with DockerContainer( - docker_image=DEFAULT_IMAGE, cwd="/cibuildwheel/working_directory" - ) as container: +@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) +def test_cwd(container_kwargs): + with DockerContainer(cwd="/cibuildwheel/working_directory", **container_kwargs) as container: assert container.call(["pwd"], capture_output=True) == "/cibuildwheel/working_directory\n" assert container.call(["pwd"], capture_output=True, cwd="/opt") == "/opt\n" @pytest.mark.docker -def test_container_removed(): - with DockerContainer(docker_image=DEFAULT_IMAGE) as container: +@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) +def test_container_removed(container_kwargs): + with DockerContainer(**container_kwargs) as container: docker_containers_listing = subprocess.run( - "docker container ls", + f"{container.container_engine} container ls", shell=True, check=True, stdout=subprocess.PIPE, universal_newlines=True, + env=container.env, ).stdout assert container.name is not None assert container.name in docker_containers_listing old_container_name = container.name docker_containers_listing = subprocess.run( - "docker container ls", + f"{container.container_engine} container ls", shell=True, check=True, stdout=subprocess.PIPE, universal_newlines=True, + env=container.env, ).stdout assert old_container_name not in docker_containers_listing @pytest.mark.docker -def test_large_environment(): +@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) +def test_large_environment(container_kwargs): # max environment variable size is 128kB long_env_var_length = 127 * 1024 large_environment = { @@ -90,7 +252,7 @@ def test_large_environment(): "d": "0" * long_env_var_length, } - with DockerContainer(docker_image=DEFAULT_IMAGE) as container: + with DockerContainer(**container_kwargs) as container: # check the length of d assert ( container.call(["sh", "-c", "echo ${#d}"], env=large_environment, capture_output=True) @@ -99,8 +261,9 @@ def test_large_environment(): @pytest.mark.docker -def test_binary_output(): - with DockerContainer(docker_image=DEFAULT_IMAGE) as container: +@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) +def test_binary_output(container_kwargs): + with DockerContainer(**container_kwargs) as container: # note: the below embedded snippets are in python2 # check that we can pass though arbitrary binary data without erroring @@ -150,8 +313,9 @@ def test_binary_output(): @pytest.mark.docker -def test_file_operations(tmp_path: Path): - with DockerContainer(docker_image=DEFAULT_IMAGE) as container: +@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) +def test_file_operation(tmp_path: Path, container_kwargs): + with DockerContainer(**container_kwargs) as container: # test copying a file in test_binary_data = bytes(random.randrange(256) for _ in range(1000)) original_test_file = tmp_path / "test.dat" @@ -166,8 +330,9 @@ def test_file_operations(tmp_path: Path): @pytest.mark.docker -def test_dir_operations(tmp_path: Path): - with DockerContainer(docker_image=DEFAULT_IMAGE) as container: +@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) +def test_dir_operations(tmp_path: Path, container_kwargs): + with DockerContainer(**container_kwargs) as container: test_binary_data = bytes(random.randrange(256) for _ in range(1000)) original_test_file = tmp_path / "test.dat" original_test_file.write_bytes(test_binary_data) @@ -196,7 +361,8 @@ def test_dir_operations(tmp_path: Path): @pytest.mark.docker -def test_environment_executor(): - with DockerContainer(docker_image=DEFAULT_IMAGE) as container: +@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) +def test_environment_executor(container_kwargs): + with DockerContainer(**container_kwargs) as container: assignment = EnvironmentAssignmentBash("TEST=$(echo 42)") assert assignment.evaluated_value({}, container.environment_executor) == "42" From 8dd76aaad7f722d5180db89f0b0a899194a3b43e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 23 Jun 2022 15:01:00 +0000 Subject: [PATCH 02/41] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- cibuildwheel/docker_container.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index ff57b78d..e4543815 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -1,6 +1,6 @@ import io -import os import json +import os import platform import shlex import shutil From 08bf6bfc8b5cbada3ac1132725a2dce2339dc6e2 Mon Sep 17 00:00:00 2001 From: joncrall Date: Thu, 23 Jun 2022 11:03:09 -0400 Subject: [PATCH 03/41] Fix bad fmtstring --- cibuildwheel/docker_container.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index ff57b78d..02636061 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -172,7 +172,7 @@ class DockerContainer: else: with subprocess.Popen( [ - "{self.container_engine}", + self.container_engine, "exec", "-i", str(self.name), From 65d70682afe31ca92b26c9fd376f043f9b17df47 Mon Sep 17 00:00:00 2001 From: joncrall Date: Thu, 23 Jun 2022 11:08:09 -0400 Subject: [PATCH 04/41] have doctest use a pinned docker images --- cibuildwheel/docker_container.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index 8da13d7e..55372be1 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -32,12 +32,14 @@ class DockerContainer: Example: >>> from cibuildwheel.docker_container import * # NOQA - >>> docker_image = "quay.io/pypa/manylinux2014_x86_64:2020-05-17-2f8ac3b" + >>> from cibuildwheel.options import _get_pinned_docker_images + >>> docker_image = _get_pinned_docker_images()['x86_64']['manylinux2014'] >>> # Test the default container >>> with DockerContainer(docker_image=docker_image) as self: ... self.call(["echo", "hello world"]) ... self.call(["cat", "/proc/1/cgroup"]) ... print(self.get_environment()) + ... print(self.debug_info()) """ UTILITY_PYTHON = "/opt/python/cp38-cp38/bin/python" From 0696c94710c746f6c6d0255e5d8c3f98870c57bc Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 19 Jun 2022 16:34:28 +0200 Subject: [PATCH 05/41] feature: add support for `py3-none-{platform}` wheels This extends the mechanism introduced in #1091 for `abi3` wheels. Most of the mentions to `abi3` have been removed and replaced by a more generic `compatible_wheel`. This allows to build a wheel `foo-0.1-py3-none-win_amd64.whl` only once and still test with every configured python. --- cibuildwheel/linux.py | 12 +++++------ cibuildwheel/macos.py | 12 +++++------ cibuildwheel/util.py | 20 ++++++++++--------- cibuildwheel/windows.py | 12 +++++------ unit_test/utils_test.py | 44 ++++++++++++++++++++++++++++++++++++++++- 5 files changed, 72 insertions(+), 28 deletions(-) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 93225c21..58fe4dc9 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -12,7 +12,7 @@ from .typing import OrderedDict, PathOrStr, assert_never from .util import ( BuildSelector, NonPlatformWheelError, - find_compatible_abi3_wheel, + find_compatible_wheel, get_build_verbosity_extra_flags, prepare_command, read_python_configs, @@ -177,13 +177,13 @@ def build_on_docker( ) sys.exit(1) - abi3_wheel = find_compatible_abi3_wheel(built_wheels, config.identifier) - if abi3_wheel: + compatible_wheel = find_compatible_wheel(built_wheels, config.identifier) + if compatible_wheel: log.step_end() print( - f"\nFound previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." + f"\nFound previously built wheel {compatible_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) - repaired_wheels = [abi3_wheel] + repaired_wheels = [compatible_wheel] else: if build_options.before_build: @@ -304,7 +304,7 @@ def build_on_docker( docker.call(["rm", "-rf", venv_dir]) # move repaired wheels to output - if abi3_wheel is None: + if compatible_wheel is None: docker.call(["mkdir", "-p", container_output_dir]) docker.call(["mv", *repaired_wheels, container_output_dir]) built_wheels.extend( diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 91ba3f8e..56942cfb 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -23,7 +23,7 @@ from .util import ( call, detect_ci_provider, download, - find_compatible_abi3_wheel, + find_compatible_wheel, get_build_verbosity_extra_flags, get_pip_version, install_certifi_script, @@ -321,13 +321,13 @@ def build(options: Options, tmp_path: Path) -> None: build_options.build_frontend, ) - abi3_wheel = find_compatible_abi3_wheel(built_wheels, config.identifier) - if abi3_wheel: + compatible_wheel = find_compatible_wheel(built_wheels, config.identifier) + if compatible_wheel: log.step_end() print( - f"\nFound previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." + f"\nFound previously built wheel {compatible_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) - repaired_wheel = abi3_wheel + repaired_wheel = compatible_wheel else: if build_options.before_build: log.step("Running before_build...") @@ -534,7 +534,7 @@ def build(options: Options, tmp_path: Path) -> None: ) # we're all done here; move it to output (overwrite existing) - if abi3_wheel is None: + if compatible_wheel is None: try: (build_options.output_dir / repaired_wheel.name).unlink() except FileNotFoundError: diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index db0cc687..45cd243a 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -54,7 +54,7 @@ __all__ = [ "MANYLINUX_ARCHS", "call", "shell", - "find_compatible_abi3_wheel", + "find_compatible_wheel", "format_safe", "prepare_command", "get_build_verbosity_extra_flags", @@ -574,23 +574,25 @@ def virtualenv( T = TypeVar("T", bound=PurePath) -def find_compatible_abi3_wheel(wheels: Sequence[T], identifier: str) -> Optional[T]: +def find_compatible_wheel(wheels: Sequence[T], identifier: str) -> Optional[T]: """ - Finds an ABI3 wheel in `wheels` compatible with the Python interpreter + Finds a wheel with an abi3 or a none ABI tag in `wheels` compatible with the Python interpreter specified by `identifier`. """ interpreter, platform = identifier.split("-") - if not interpreter.startswith("cp3"): - return None for wheel in wheels: _, _, _, tags = parse_wheel_filename(wheel.name) for tag in tags: - if tag.abi != "abi3": + if tag.abi == "abi3": + if not (interpreter.startswith("cp3") and tag.interpreter.startswith("cp3")): + continue + elif tag.abi == "none": + if tag.interpreter[:3] != "py3": + continue + else: continue - if not tag.interpreter.startswith("cp3"): - continue - if int(tag.interpreter[3:]) > int(interpreter[3:]): + if tag.interpreter != "py3" and int(tag.interpreter[3:]) > int(interpreter[3:]): continue if platform.startswith(("manylinux", "musllinux", "macosx")): # Linux, macOS diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 1e95c225..5f0d2344 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -22,7 +22,7 @@ from .util import ( NonPlatformWheelError, call, download, - find_compatible_abi3_wheel, + find_compatible_wheel, get_build_verbosity_extra_flags, get_pip_version, prepare_command, @@ -277,13 +277,13 @@ def build(options: Options, tmp_path: Path) -> None: build_options.build_frontend, ) - abi3_wheel = find_compatible_abi3_wheel(built_wheels, config.identifier) - if abi3_wheel: + compatible_wheel = find_compatible_wheel(built_wheels, config.identifier) + if compatible_wheel: log.step_end() print( - f"\nFound previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." + f"\nFound previously built wheel {compatible_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) - repaired_wheel = abi3_wheel + repaired_wheel = compatible_wheel else: # run the before_build command if build_options.before_build: @@ -418,7 +418,7 @@ def build(options: Options, tmp_path: Path) -> None: shell(test_command_prepared, cwd="c:\\", env=virtualenv_env) # we're all done here; move it to output (remove if already exists) - if abi3_wheel is None: + if compatible_wheel is None: shutil.move(str(repaired_wheel), build_options.output_dir) built_wheels.append(build_options.output_dir / repaired_wheel.name) diff --git a/unit_test/utils_test.py b/unit_test/utils_test.py index 41e376fa..7f949a73 100644 --- a/unit_test/utils_test.py +++ b/unit_test/utils_test.py @@ -1,4 +1,8 @@ -from cibuildwheel.util import format_safe, prepare_command +from pathlib import PurePath + +import pytest + +from cibuildwheel.util import find_compatible_wheel, format_safe, prepare_command def test_format_safe(): @@ -46,3 +50,41 @@ def test_prepare_command(): prepare_command("{a}{a,b}{b:.2e}{c}{d%s}{e:3}{f[0]}", a="42", b="3.14159") == "42{a,b}{b:.2e}{c}{d%s}{e:3}{f[0]}" ) + + +@pytest.mark.parametrize( + "wheel,identifier", + ( + ("foo-0.1-cp38-abi3-win_amd64.whl", "cp310-win_amd64"), + ("foo-0.1-cp38-abi3-macosx_11_0_x86_64.whl", "cp310-macosx_x86_64"), + ("foo-0.1-cp38-abi3-manylinux2014_x86_64.whl", "cp310-manylinux_x86_64"), + ("foo-0.1-cp38-abi3-musllinux_1_1_x86_64.whl", "cp310-musllinux_x86_64"), + ("foo-0.1-py2.py3-none-win_amd64.whl", "cp310-win_amd64"), + ("foo-0.1-py2.py3-none-win_amd64.whl", "pp310-win_amd64"), + ("foo-0.1-py3-none-win_amd64.whl", "cp310-win_amd64"), + ("foo-0.1-py38-none-win_amd64.whl", "cp310-win_amd64"), + ("foo-0.1-py38-none-win_amd64.whl", "pp310-win_amd64"), + ), +) +def test_find_compatible_wheel_found(wheel: str, identifier: str): + wheel_ = PurePath(wheel) + found = find_compatible_wheel([wheel_], identifier) + assert found is wheel_ + + +@pytest.mark.parametrize( + "wheel,identifier", + ( + ("foo-0.1-cp38-abi3-win_amd64.whl", "cp310-win32"), + ("foo-0.1-cp38-abi3-win_amd64.whl", "cp37-win_amd64"), + ("foo-0.1-cp38-abi3-macosx_11_0_x86_64.whl", "cp310-macosx_universal2"), + ("foo-0.1-cp38-abi3-manylinux2014_x86_64.whl", "cp310-musllinux_x86_64"), + ("foo-0.1-cp38-abi3-musllinux_1_1_x86_64.whl", "cp310-manylinux_x86_64"), + ("foo-0.1-py2-none-win_amd64.whl", "cp310-win_amd64"), + ("foo-0.1-py38-none-win_amd64.whl", "cp37-win_amd64"), + ("foo-0.1-py38-none-win_amd64.whl", "pp37-win_amd64"), + ("foo-0.1-cp38-cp38-win_amd64.whl", "cp310-win_amd64"), + ), +) +def test_find_compatible_wheel_not_found(wheel: str, identifier: str): + assert find_compatible_wheel([PurePath(wheel)], identifier) is None From ef18186c455b3d4225b9de89e623cb2a77c6091c Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 19 Jun 2022 18:03:05 +0200 Subject: [PATCH 06/41] fix: error out if multiple wheels with the same name are produced We shouldn't silently overwrite wheels that are produced in the same run that have the same filename, as this implies a misconfiguration. --- cibuildwheel/linux.py | 5 +++++ cibuildwheel/macos.py | 4 ++++ cibuildwheel/util.py | 14 ++++++++++++++ cibuildwheel/windows.py | 4 ++++ test/test_same_wheel.py | 42 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 69 insertions(+) create mode 100644 test/test_same_wheel.py diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 58fe4dc9..d6b39e74 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -10,6 +10,7 @@ from .logger import log from .options import Options from .typing import OrderedDict, PathOrStr, assert_never from .util import ( + AlreadyBuiltWheelError, BuildSelector, NonPlatformWheelError, find_compatible_wheel, @@ -255,6 +256,10 @@ def build_on_docker( repaired_wheels = docker.glob(repaired_wheel_dir, "*.whl") + for repaired_wheel in repaired_wheels: + if repaired_wheel.name in {wheel.name for wheel in built_wheels}: + raise AlreadyBuiltWheelError(repaired_wheel.name) + if build_options.test_command and build_options.test_selector(config.identifier): log.step("Testing wheel...") diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 56942cfb..d5fff5ed 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -17,6 +17,7 @@ from .options import Options from .typing import Literal, PathOrStr, assert_never from .util import ( CIBW_CACHE_PATH, + AlreadyBuiltWheelError, BuildFrontend, BuildSelector, NonPlatformWheelError, @@ -408,6 +409,9 @@ def build(options: Options, tmp_path: Path) -> None: repaired_wheel = next(repaired_wheel_dir.glob("*.whl")) + if repaired_wheel.name in {wheel.name for wheel in built_wheels}: + raise AlreadyBuiltWheelError(repaired_wheel.name) + log.step_end() if build_options.test_command and build_options.test_selector(config.identifier): diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index 45cd243a..268e7ce4 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -373,6 +373,20 @@ class NonPlatformWheelError(Exception): super().__init__(message) +class AlreadyBuiltWheelError(Exception): + def __init__(self, wheel_name: str) -> None: + message = textwrap.dedent( + f""" + cibuildwheel: Build failed because a wheel named {wheel_name} was already generated in the current run. + + If you expected another wheel to be generated, check your project configuration, or run + cibuildwheel with CIBW_BUILD_VERBOSITY=1 to view build logs. + """ + ) + + super().__init__(message) + + def strtobool(val: str) -> bool: return val.lower() in {"y", "yes", "t", "true", "on", "1"} diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 5f0d2344..b4ae6e07 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -17,6 +17,7 @@ from .options import Options from .typing import PathOrStr, assert_never from .util import ( CIBW_CACHE_PATH, + AlreadyBuiltWheelError, BuildFrontend, BuildSelector, NonPlatformWheelError, @@ -365,6 +366,9 @@ def build(options: Options, tmp_path: Path) -> None: repaired_wheel = next(repaired_wheel_dir.glob("*.whl")) + if repaired_wheel.name in {wheel.name for wheel in built_wheels}: + raise AlreadyBuiltWheelError(repaired_wheel.name) + if build_options.test_command and options.globals.test_selector(config.identifier): log.step("Testing wheel...") # set up a virtual environment to install and test from, to make sure diff --git a/test/test_same_wheel.py b/test/test_same_wheel.py new file mode 100644 index 00000000..d89f28cb --- /dev/null +++ b/test/test_same_wheel.py @@ -0,0 +1,42 @@ +import subprocess +from test import test_projects + +import pytest + +from . import utils + +basic_project = test_projects.new_c_project() +basic_project.files[ + "repair.py" +] = """ +import shutil +import sys +from pathlib import Path + +wheel = Path(sys.argv[1]) +dest_dir = Path(sys.argv[2]) +platform = wheel.stem.split("-")[-1] +name = f"spam-0.1.0-py2-none-{platform}.whl" +dest = dest_dir / name +dest_dir.mkdir(parents=True, exist_ok=True) +if dest.exists(): + dest.unlink() +shutil.copy(wheel, dest) +""" + + +def test(tmp_path, capfd): + # this test checks that a generated wheel name shall be unique in a given cibuildwheel run + project_dir = tmp_path / "project" + basic_project.generate(project_dir) + + with pytest.raises(subprocess.CalledProcessError): + utils.cibuildwheel_run( + project_dir, + add_env={ + "CIBW_REPAIR_WHEEL_COMMAND": "python repair.py {wheel} {dest_dir}", + }, + ) + + captured = capfd.readouterr() + assert "Build failed because a wheel named" in captured.err From 90945a38d2fc3ee8d2ad155baeafb951cd624b2e Mon Sep 17 00:00:00 2001 From: joncrall Date: Sun, 26 Jun 2022 15:53:44 -0400 Subject: [PATCH 07/41] reworks --- cibuildwheel/docker_container.py | 24 +++- unit_test/docker_container_test.py | 186 +++++++++++++++-------------- 2 files changed, 115 insertions(+), 95 deletions(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index 55372be1..4fd1b471 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -80,7 +80,6 @@ class DockerContainer: network_args = ["--network=host"] shell_args = ["linux32", "/bin/bash"] if self.simulate_32_bit else ["/bin/bash"] - subprocess.run( [ self.container_engine, @@ -89,8 +88,10 @@ class DockerContainer: f"--name={self.name}", "--interactive", *network_args, + # Do we need the hostmout? # Z-flags is for SELinux - "--volume=/:/host:Z", # ignored on CircleCI + # "--volume=/:/host:Z", # ignored on CircleCI + # "--volume=/:/host", self.docker_image, *shell_args, ], @@ -116,13 +117,13 @@ class DockerContainer: self.bash_stdout = self.process.stdout # run a noop command to block until the container is responding - self.call(["/bin/true"], cwd="") + self.call(["/bin/true"], cwd="/") if self.cwd: # Although `docker create -w` does create the working dir if it # does not exist, podman does not. There does not seem to be a way # to setup a workdir for a container running in podman. - self.call(["mkdir", "-p", str(self.cwd)], cwd="") + self.call(["mkdir", "-p", str(self.cwd)], cwd="/") return self @@ -200,7 +201,20 @@ class DockerContainer: # note: we assume from_path is a dir to_path.mkdir(parents=True, exist_ok=True) - if self.container_engine == "podman": + TRY_SIMPLE_CP = 0 + if TRY_SIMPLE_CP: + # There is a bug in docker that prevents this simple implementation + # from working https://github.com/moby/moby/issues/38995 + # It seems to also not workin podman as well + command = f"{self.container_engine} cp {self.name}:{shell_quote(from_path)} {shell_quote(to_path)}" + subprocess.run( + command, + shell=True, + check=True, + cwd=to_path, + env=self.env, + ) + elif self.container_engine == "podman": # The copy out logic that works for docker does not seem to # translate to podman, which seems to need the steps spelled out # more explicitly. diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index dd317ee2..a52279e8 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -28,11 +28,14 @@ elif pm == "s390x": else: DEFAULT_IMAGE = "" - -temp_test_dir = None +# A dictionary to make it easier to manipulate globals +_STATE = { + 'temp_test_dir': None, + 'using_podman': False, +} -@atexit.register +# @atexit.register def _cleanup_tempdir(): """ Cleans up any configuration written by :func:`basis_container_kwargs`. @@ -42,37 +45,24 @@ def _cleanup_tempdir(): It may be possible to handle this more cleanly in pytest itself, but using atexit works well enough for now. + + The reason why permission errors occur on podman is documented in + [PodmanStoragePerms]_. + + References: + .. [PodmanStoragePerms] https://podman.io/blogs/2018/10/03/podman-remove-content-homedir.html """ - import stat - - global temp_test_dir + temp_test_dir = _STATE['temp_test_dir'] if temp_test_dir is not None: - print(f"CLEANUP temp_test_dir = {temp_test_dir!r}") # type: ignore[unreachable] - for r, ds, fs in os.walk(temp_test_dir.name): - for d in ds: - dpath = os.path.join(r, d) - if not os.path.islink(dpath): - perms = os.lstat(dpath).st_mode - try: - os.chmod(dpath, stat.S_IWUSR | perms) - except Exception as ex: - print(f"issue with dpath = {dpath!r}, {ex!r}") - - for f in fs: - fpath = os.path.join(r, f) - if not os.path.islink(fpath): - perms = os.lstat(fpath).st_mode - try: - os.chmod(fpath, stat.S_IWUSR | perms) - except Exception as ex: - print(f"issue with fpath = {fpath!r}, {ex!r}") - else: - os.unlink(fpath) + # When podman creates special directories, they cant be cleaned up + # unless you fake a UID of 0. The package rootlesskit helps with that. + if _STATE['using_podman']: + subprocess.call(['podman', 'unshare', 'rm', '-rf', temp_test_dir.name]) try: temp_test_dir.cleanup() except Exception as ex: print(f"Issue cleaning up ex = {ex!r}") - temp_test_dir = None + _STATE['temp_test_dir'] = None def basis_container_kwargs(): @@ -80,18 +70,27 @@ def basis_container_kwargs(): Generate keyword args that can be passed to to :class:`DockerContainer`. This is used with :func:`pytest.mark.parametrize` to run each test with - different configuraions of each supported containers engine. + different configurations of each supported containers engine. For docker we test the default configuration. For podman we test the default configuration and a configuration with VFS (virtual file system) enabled as the storage driver. + + Yields: + Dict: a configuration passed as ``container_kwargs`` to each + parameterized test. """ - global temp_test_dir - if temp_test_dir is None: + if _STATE['temp_test_dir'] is None: # Only setup the temp directory once for all tests - temp_test_dir = tempfile.TemporaryDirectory(prefix="cibw_test_") + _STATE['temp_test_dir'] = tempfile.TemporaryDirectory(prefix="cibw_test_") + # Register the special cleanup hook after the temp directory is created + # to ensure that it runs before the temp directory logic runs (which + # will not handle cases where there is a fake root UID). + atexit.register(_cleanup_tempdir) + + temp_test_dir = _STATE['temp_test_dir'] HAVE_DOCKER = bool(shutil.which("docker")) HAVE_PODMAN = bool(shutil.which("podman")) @@ -102,67 +101,11 @@ def basis_container_kwargs(): if HAVE_PODMAN: # Basic podman usage + _STATE['using_podman'] = True yield {"container_engine": "podman", "docker_image": DEFAULT_IMAGE} # VFS Podman usage (for the podman in docker use-case) - dpath = Path(temp_test_dir.name) - - # This requires that we write configuration files and point to them - # with environment variables before we run podman - # https://github.com/containers/common/blob/main/docs/containers.conf.5.md - vfs_containers_conf_data = { - "containers": { - "default_capabilities": [ - "CHOWN", - "DAC_OVERRIDE", - "FOWNER", - "FSETID", - "KILL", - "NET_BIND_SERVICE", - "SETFCAP", - "SETGID", - "SETPCAP", - "SETUID", - "SYS_CHROOT", - ] - }, - "engine": {"cgroup_manager": "cgroupfs", "events_logger": "file"}, - } - # https://github.com/containers/storage/blob/main/docs/containers-storage.conf.5.md - storage_root = dpath / ".local/share/containers/vfs-storage" - run_root = dpath / ".local/share/containers/vfs-runroot" - storage_root.mkdir(parents=True, exist_ok=True) - run_root.mkdir(parents=True, exist_ok=True) - vfs_containers_storage_conf_data = { - "storage": { - "driver": "vfs", - "graphroot": str(storage_root), - "runroot": str(run_root), - "rootless_storage_path": str(storage_root), - "options": { - # "remap-user": "containers", - "aufs": {"mountopt": "rw"}, - "overlay": {"mountopt": "rw", "force_mask": "shared"}, - # "vfs": {"ignore_chown_errors": "true"}, - }, - } - } - vfs_containers_conf_fpath = dpath / "temp_vfs_containers.conf" - vfs_containers_storage_conf_fpath = dpath / "temp_vfs_containers_storage.conf" - with open(vfs_containers_conf_fpath, "w") as file: - toml.dump(vfs_containers_conf_data, file) - - with open(vfs_containers_storage_conf_fpath, "w") as file: - toml.dump(vfs_containers_storage_conf_data, file) - - oci_environ = os.environ.copy() - oci_environ.update( - { - "CONTAINERS_CONF": str(vfs_containers_conf_fpath), - "CONTAINERS_STORAGE_CONF": str(vfs_containers_storage_conf_fpath), - } - ) - + oci_environ = _setup_podman_vfs(temp_test_dir.name) yield { "container_engine": "podman", "docker_image": DEFAULT_IMAGE, @@ -170,6 +113,69 @@ def basis_container_kwargs(): } +def _setup_podman_vfs(dpath): + """ + Setup the filesystem and environment variables for the VFS podman test + """ + dpath = Path(dpath) + # This requires that we write configuration files and point to them + # with environment variables before we run podman + # https://github.com/containers/common/blob/main/docs/containers.conf.5.md + vfs_containers_conf_data = { + "containers": { + "default_capabilities": [ + "CHOWN", + "DAC_OVERRIDE", + "FOWNER", + "FSETID", + "KILL", + "NET_BIND_SERVICE", + "SETFCAP", + "SETGID", + "SETPCAP", + "SETUID", + "SYS_CHROOT", + ] + }, + "engine": {"cgroup_manager": "cgroupfs", "events_logger": "file"}, + } + # https://github.com/containers/storage/blob/main/docs/containers-storage.conf.5.md + storage_root = dpath / ".local/share/containers/vfs-storage" + run_root = dpath / ".local/share/containers/vfs-runroot" + storage_root.mkdir(parents=True, exist_ok=True) + run_root.mkdir(parents=True, exist_ok=True) + vfs_containers_storage_conf_data = { + "storage": { + "driver": "vfs", + "graphroot": os.fspath(storage_root), + "runroot": os.fspath(run_root), + "rootless_storage_path": os.fspath(storage_root), + "options": { + # "remap-user": "containers", + "aufs": {"mountopt": "rw"}, + "overlay": {"mountopt": "rw", "force_mask": "shared"}, + # "vfs": {"ignore_chown_errors": "true"}, + }, + } + } + vfs_containers_conf_fpath = dpath / "temp_vfs_containers.conf" + vfs_containers_storage_conf_fpath = dpath / "temp_vfs_containers_storage.conf" + with open(vfs_containers_conf_fpath, "w") as file: + toml.dump(vfs_containers_conf_data, file) + + with open(vfs_containers_storage_conf_fpath, "w") as file: + toml.dump(vfs_containers_storage_conf_data, file) + + oci_environ = os.environ.copy() + oci_environ.update( + { + "CONTAINERS_CONF": os.fspath(vfs_containers_conf_fpath), + "CONTAINERS_STORAGE_CONF": os.fspath(vfs_containers_storage_conf_fpath), + } + ) + return oci_environ + + @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) def test_simple(container_kwargs): From 4a7d89b3c8882441ae01de502a93d43b9a71985e Mon Sep 17 00:00:00 2001 From: joncrall Date: Sun, 26 Jun 2022 16:57:26 -0400 Subject: [PATCH 08/41] Does podman work with the original host args --- cibuildwheel/docker_container.py | 32 +++++++++++------------ unit_test/docker_container_test.py | 42 +++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index 4fd1b471..0d010aee 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -65,7 +65,6 @@ class DockerContainer: self.cwd = cwd self.name: Optional[str] = None self.container_engine = container_engine - self.env = env # If specified, overwrite environment variables def __enter__(self) -> "DockerContainer": @@ -80,6 +79,21 @@ class DockerContainer: network_args = ["--network=host"] shell_args = ["linux32", "/bin/bash"] if self.simulate_32_bit else ["/bin/bash"] + + # volume args are ignored on CircleCI + # For a discussion of if :Z should be included or not: + # https://github.com/pypa/cibuildwheel/pull/966#discussion_r906707824 + # https://stackoverflow.com/questions/35218194/what-is-z-flag-in-docker-containers-volumes-from-option/35222815#35222815 + # https://github.com/moby/moby/issues/30934 + # The Z option indicates that the bind mount content is private and + # unshared. Use extreme caution with these options. Bind-mounting a + # system directory such as /home or /usr with the Z option renders your + # host machine inoperable and you may need to relabel the host machine + # files by hand. + volume_args = ['--volume=/:/host'] + # volume_args = ['--volume=/:/host:Z'] + # volume_args = [] + subprocess.run( [ self.container_engine, @@ -88,14 +102,10 @@ class DockerContainer: f"--name={self.name}", "--interactive", *network_args, - # Do we need the hostmout? - # Z-flags is for SELinux - # "--volume=/:/host:Z", # ignored on CircleCI - # "--volume=/:/host", + *volume_args, self.docker_image, *shell_args, ], - env=self.env, check=True, ) @@ -109,7 +119,6 @@ class DockerContainer: ], stdin=subprocess.PIPE, stdout=subprocess.PIPE, - env=self.env, ) assert self.process.stdin and self.process.stdout @@ -152,7 +161,6 @@ class DockerContainer: subprocess.run( [self.container_engine, "rm", "--force", "-v", self.name], stdout=subprocess.DEVNULL, - env=self.env, check=False, ) self.name = None @@ -170,7 +178,6 @@ class DockerContainer: shell=True, check=True, cwd=from_path, - env=self.env, ) else: with subprocess.Popen( @@ -183,7 +190,6 @@ class DockerContainer: "-c", f"cat > {shell_quote(to_path)}", ], - env=self.env, stdin=subprocess.PIPE, ) as docker: docker.stdin = cast(IO[bytes], docker.stdin) @@ -212,7 +218,6 @@ class DockerContainer: shell=True, check=True, cwd=to_path, - env=self.env, ) elif self.container_engine == "podman": # The copy out logic that works for docker does not seem to @@ -224,7 +229,6 @@ class DockerContainer: shell=True, check=True, cwd=to_path, - env=self.env, ) command = f"{self.container_engine} cp {self.name}:/tmp/output-{self.name}.tar output-{self.name}.tar" @@ -233,7 +237,6 @@ class DockerContainer: shell=True, check=True, cwd=to_path, - env=self.env, ) command = f"tar -xvf output-{self.name}.tar" subprocess.run( @@ -241,7 +244,6 @@ class DockerContainer: shell=True, check=True, cwd=to_path, - env=self.env, ) os.unlink(to_path / f"output-{self.name}.tar") elif self.container_engine == "docker": @@ -251,7 +253,6 @@ class DockerContainer: shell=True, check=True, cwd=to_path, - env=self.env, ) else: raise KeyError(self.container_engine) @@ -380,7 +381,6 @@ class DockerContainer: shell=True, check=True, cwd=self.cwd, - env=self.env, stdin=subprocess.PIPE, stdout=subprocess.PIPE, ) diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index a52279e8..52603b5a 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -178,21 +178,27 @@ def _setup_podman_vfs(dpath): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_simple(container_kwargs): +def test_simple(container_kwargs, monkeypatch): + for k, v in container_kwargs.pop('env', {}).items(): + monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: assert container.call(["echo", "hello"], capture_output=True) == "hello\n" @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_no_lf(container_kwargs): +def test_no_lf(container_kwargs, monkeypatch): + for k, v in container_kwargs.pop('env', {}).items(): + monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: assert container.call(["printf", "hello"], capture_output=True) == "hello" @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_debug_info(container_kwargs): +def test_debug_info(container_kwargs, monkeypatch): + for k, v in container_kwargs.pop('env', {}).items(): + monkeypatch.setenv(k, v) container = DockerContainer(**container_kwargs) print(container.debug_info()) with container: @@ -201,7 +207,9 @@ def test_debug_info(container_kwargs): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_environment(container_kwargs): +def test_environment(container_kwargs, monkeypatch): + for k, v in container_kwargs.pop('env', {}).items(): + monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: assert ( container.call( @@ -221,7 +229,9 @@ def test_cwd(container_kwargs): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_container_removed(container_kwargs): +def test_container_removed(container_kwargs, monkeypatch): + for k, v in container_kwargs.pop('env', {}).items(): + monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: docker_containers_listing = subprocess.run( f"{container.container_engine} container ls", @@ -229,7 +239,6 @@ def test_container_removed(container_kwargs): check=True, stdout=subprocess.PIPE, universal_newlines=True, - env=container.env, ).stdout assert container.name is not None assert container.name in docker_containers_listing @@ -241,14 +250,15 @@ def test_container_removed(container_kwargs): check=True, stdout=subprocess.PIPE, universal_newlines=True, - env=container.env, ).stdout assert old_container_name not in docker_containers_listing @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_large_environment(container_kwargs): +def test_large_environment(container_kwargs, monkeypatch): + for k, v in container_kwargs.pop('env', {}).items(): + monkeypatch.setenv(k, v) # max environment variable size is 128kB long_env_var_length = 127 * 1024 large_environment = { @@ -268,7 +278,9 @@ def test_large_environment(container_kwargs): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_binary_output(container_kwargs): +def test_binary_output(container_kwargs, monkeypatch): + for k, v in container_kwargs.pop('env', {}).items(): + monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: # note: the below embedded snippets are in python2 @@ -320,7 +332,9 @@ def test_binary_output(container_kwargs): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_file_operation(tmp_path: Path, container_kwargs): +def test_file_operation(tmp_path: Path, container_kwargs, monkeypatch): + for k, v in container_kwargs.pop('env', {}).items(): + monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: # test copying a file in test_binary_data = bytes(random.randrange(256) for _ in range(1000)) @@ -337,7 +351,9 @@ def test_file_operation(tmp_path: Path, container_kwargs): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_dir_operations(tmp_path: Path, container_kwargs): +def test_dir_operations(tmp_path: Path, container_kwargs, monkeypatch): + for k, v in container_kwargs.pop('env', {}).items(): + monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: test_binary_data = bytes(random.randrange(256) for _ in range(1000)) original_test_file = tmp_path / "test.dat" @@ -368,7 +384,9 @@ def test_dir_operations(tmp_path: Path, container_kwargs): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_environment_executor(container_kwargs): +def test_environment_executor(container_kwargs, monkeypatch): + for k, v in container_kwargs.pop('env', {}).items(): + monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: assignment = EnvironmentAssignmentBash("TEST=$(echo 42)") assert assignment.evaluated_value({}, container.environment_executor) == "42" From 15993834293f91fe27033b31edd520fc8eabdd5c Mon Sep 17 00:00:00 2001 From: joncrall Date: Sun, 26 Jun 2022 17:10:02 -0400 Subject: [PATCH 09/41] Cleanup --- cibuildwheel/docker_container.py | 23 ++++--------------- unit_test/docker_container_test.py | 37 ++++++++++++++++-------------- 2 files changed, 24 insertions(+), 36 deletions(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index 0d010aee..cad594d8 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -55,7 +55,6 @@ class DockerContainer: simulate_32_bit: bool = False, cwd: Optional[PathOrStr] = None, container_engine: str = "docker", - env: Optional[Dict[str, str]] = None, ): if not docker_image: raise ValueError("Must have a non-empty docker image to run.") @@ -80,20 +79,6 @@ class DockerContainer: shell_args = ["linux32", "/bin/bash"] if self.simulate_32_bit else ["/bin/bash"] - # volume args are ignored on CircleCI - # For a discussion of if :Z should be included or not: - # https://github.com/pypa/cibuildwheel/pull/966#discussion_r906707824 - # https://stackoverflow.com/questions/35218194/what-is-z-flag-in-docker-containers-volumes-from-option/35222815#35222815 - # https://github.com/moby/moby/issues/30934 - # The Z option indicates that the bind mount content is private and - # unshared. Use extreme caution with these options. Bind-mounting a - # system directory such as /home or /usr with the Z option renders your - # host machine inoperable and you may need to relabel the host machine - # files by hand. - volume_args = ['--volume=/:/host'] - # volume_args = ['--volume=/:/host:Z'] - # volume_args = [] - subprocess.run( [ self.container_engine, @@ -101,8 +86,8 @@ class DockerContainer: "--env=CIBUILDWHEEL", f"--name={self.name}", "--interactive", + "--volume=/:/host", # ignored on CircleCI *network_args, - *volume_args, self.docker_image, *shell_args, ], @@ -126,13 +111,13 @@ class DockerContainer: self.bash_stdout = self.process.stdout # run a noop command to block until the container is responding - self.call(["/bin/true"], cwd="/") + self.call(["/bin/true"]) if self.cwd: # Although `docker create -w` does create the working dir if it # does not exist, podman does not. There does not seem to be a way # to setup a workdir for a container running in podman. - self.call(["mkdir", "-p", str(self.cwd)], cwd="/") + self.call(["mkdir", "-p", os.fspath(self.cwd)]) return self @@ -389,4 +374,4 @@ class DockerContainer: def shell_quote(path: PurePath) -> str: - return shlex.quote(str(path)) + return shlex.quote(os.fspath(path)) diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index 52603b5a..fac3dfdf 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -36,7 +36,7 @@ _STATE = { # @atexit.register -def _cleanup_tempdir(): +def _cleanup_podman_vfs_tempdir(): """ Cleans up any configuration written by :func:`basis_container_kwargs`. @@ -58,10 +58,6 @@ def _cleanup_tempdir(): # unless you fake a UID of 0. The package rootlesskit helps with that. if _STATE['using_podman']: subprocess.call(['podman', 'unshare', 'rm', '-rf', temp_test_dir.name]) - try: - temp_test_dir.cleanup() - except Exception as ex: - print(f"Issue cleaning up ex = {ex!r}") _STATE['temp_test_dir'] = None @@ -82,24 +78,31 @@ def basis_container_kwargs(): parameterized test. """ - if _STATE['temp_test_dir'] is None: - # Only setup the temp directory once for all tests - _STATE['temp_test_dir'] = tempfile.TemporaryDirectory(prefix="cibw_test_") - # Register the special cleanup hook after the temp directory is created - # to ensure that it runs before the temp directory logic runs (which - # will not handle cases where there is a fake root UID). - atexit.register(_cleanup_tempdir) - - temp_test_dir = _STATE['temp_test_dir'] - + # TODO: Pytest should be aware of if we are trying to test docker / podman + # or not HAVE_DOCKER = bool(shutil.which("docker")) HAVE_PODMAN = bool(shutil.which("podman")) - if HAVE_DOCKER: + REQUESTED_DOCKER = HAVE_DOCKER + REQUESTED_PODMAN = HAVE_PODMAN + + if _STATE['temp_test_dir'] is None: + # Only setup the temp directory once for all tests + _STATE['temp_test_dir'] = tempfile.TemporaryDirectory(prefix="cibw_test_") + if REQUESTED_PODMAN: + # Register the special cleanup hook after the temp directory is + # created to ensure that it runs before the temp directory logic + # runs (which will not handle cases where there is a fake root + # UID). + atexit.register(_cleanup_podman_vfs_tempdir) + + temp_test_dir = _STATE['temp_test_dir'] + + if REQUESTED_DOCKER: # Basic podman configuration yield {"container_engine": "docker", "docker_image": DEFAULT_IMAGE} - if HAVE_PODMAN: + if REQUESTED_PODMAN: # Basic podman usage _STATE['using_podman'] = True yield {"container_engine": "podman", "docker_image": DEFAULT_IMAGE} From 9401c90ddb06a5ef4b513c1011084c74e3076fe6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 26 Jun 2022 21:10:51 +0000 Subject: [PATCH 10/41] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- unit_test/docker_container_test.py | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index fac3dfdf..0854af5e 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -30,8 +30,8 @@ else: # A dictionary to make it easier to manipulate globals _STATE = { - 'temp_test_dir': None, - 'using_podman': False, + "temp_test_dir": None, + "using_podman": False, } @@ -52,13 +52,13 @@ def _cleanup_podman_vfs_tempdir(): References: .. [PodmanStoragePerms] https://podman.io/blogs/2018/10/03/podman-remove-content-homedir.html """ - temp_test_dir = _STATE['temp_test_dir'] + temp_test_dir = _STATE["temp_test_dir"] if temp_test_dir is not None: # When podman creates special directories, they cant be cleaned up # unless you fake a UID of 0. The package rootlesskit helps with that. - if _STATE['using_podman']: - subprocess.call(['podman', 'unshare', 'rm', '-rf', temp_test_dir.name]) - _STATE['temp_test_dir'] = None + if _STATE["using_podman"]: + subprocess.call(["podman", "unshare", "rm", "-rf", temp_test_dir.name]) + _STATE["temp_test_dir"] = None def basis_container_kwargs(): @@ -86,9 +86,9 @@ def basis_container_kwargs(): REQUESTED_DOCKER = HAVE_DOCKER REQUESTED_PODMAN = HAVE_PODMAN - if _STATE['temp_test_dir'] is None: + if _STATE["temp_test_dir"] is None: # Only setup the temp directory once for all tests - _STATE['temp_test_dir'] = tempfile.TemporaryDirectory(prefix="cibw_test_") + _STATE["temp_test_dir"] = tempfile.TemporaryDirectory(prefix="cibw_test_") if REQUESTED_PODMAN: # Register the special cleanup hook after the temp directory is # created to ensure that it runs before the temp directory logic @@ -96,7 +96,7 @@ def basis_container_kwargs(): # UID). atexit.register(_cleanup_podman_vfs_tempdir) - temp_test_dir = _STATE['temp_test_dir'] + temp_test_dir = _STATE["temp_test_dir"] if REQUESTED_DOCKER: # Basic podman configuration @@ -104,7 +104,7 @@ def basis_container_kwargs(): if REQUESTED_PODMAN: # Basic podman usage - _STATE['using_podman'] = True + _STATE["using_podman"] = True yield {"container_engine": "podman", "docker_image": DEFAULT_IMAGE} # VFS Podman usage (for the podman in docker use-case) @@ -182,7 +182,7 @@ def _setup_podman_vfs(dpath): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) def test_simple(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop('env', {}).items(): + for k, v in container_kwargs.pop("env", {}).items(): monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: assert container.call(["echo", "hello"], capture_output=True) == "hello\n" @@ -191,7 +191,7 @@ def test_simple(container_kwargs, monkeypatch): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) def test_no_lf(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop('env', {}).items(): + for k, v in container_kwargs.pop("env", {}).items(): monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: assert container.call(["printf", "hello"], capture_output=True) == "hello" @@ -200,7 +200,7 @@ def test_no_lf(container_kwargs, monkeypatch): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) def test_debug_info(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop('env', {}).items(): + for k, v in container_kwargs.pop("env", {}).items(): monkeypatch.setenv(k, v) container = DockerContainer(**container_kwargs) print(container.debug_info()) @@ -211,7 +211,7 @@ def test_debug_info(container_kwargs, monkeypatch): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) def test_environment(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop('env', {}).items(): + for k, v in container_kwargs.pop("env", {}).items(): monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: assert ( @@ -233,7 +233,7 @@ def test_cwd(container_kwargs): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) def test_container_removed(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop('env', {}).items(): + for k, v in container_kwargs.pop("env", {}).items(): monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: docker_containers_listing = subprocess.run( @@ -260,7 +260,7 @@ def test_container_removed(container_kwargs, monkeypatch): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) def test_large_environment(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop('env', {}).items(): + for k, v in container_kwargs.pop("env", {}).items(): monkeypatch.setenv(k, v) # max environment variable size is 128kB long_env_var_length = 127 * 1024 @@ -282,7 +282,7 @@ def test_large_environment(container_kwargs, monkeypatch): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) def test_binary_output(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop('env', {}).items(): + for k, v in container_kwargs.pop("env", {}).items(): monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: # note: the below embedded snippets are in python2 @@ -336,7 +336,7 @@ def test_binary_output(container_kwargs, monkeypatch): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) def test_file_operation(tmp_path: Path, container_kwargs, monkeypatch): - for k, v in container_kwargs.pop('env', {}).items(): + for k, v in container_kwargs.pop("env", {}).items(): monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: # test copying a file in @@ -355,7 +355,7 @@ def test_file_operation(tmp_path: Path, container_kwargs, monkeypatch): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) def test_dir_operations(tmp_path: Path, container_kwargs, monkeypatch): - for k, v in container_kwargs.pop('env', {}).items(): + for k, v in container_kwargs.pop("env", {}).items(): monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: test_binary_data = bytes(random.randrange(256) for _ in range(1000)) @@ -388,7 +388,7 @@ def test_dir_operations(tmp_path: Path, container_kwargs, monkeypatch): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) def test_environment_executor(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop('env', {}).items(): + for k, v in container_kwargs.pop("env", {}).items(): monkeypatch.setenv(k, v) with DockerContainer(**container_kwargs) as container: assignment = EnvironmentAssignmentBash("TEST=$(echo 42)") From c68223b172a149617d0ed72f2cb771784107b8b4 Mon Sep 17 00:00:00 2001 From: joncrall Date: Sun, 26 Jun 2022 17:21:59 -0400 Subject: [PATCH 11/41] Make mypy happy --- unit_test/docker_container_test.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index 0854af5e..de14ea38 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -7,9 +7,10 @@ import subprocess import tempfile import textwrap from pathlib import Path, PurePath, PurePosixPath +from typing import Dict, Optional, Union import pytest -import toml # type: ignore[import] +import toml from cibuildwheel.docker_container import DockerContainer from cibuildwheel.environment import EnvironmentAssignmentBash @@ -28,11 +29,9 @@ elif pm == "s390x": else: DEFAULT_IMAGE = "" -# A dictionary to make it easier to manipulate globals -_STATE = { - "temp_test_dir": None, - "using_podman": False, -} +# These globals will be manipulated +temp_test_dir: Optional[tempfile.TemporaryDirectory[str]] = None +using_podman = False # @atexit.register @@ -52,13 +51,14 @@ def _cleanup_podman_vfs_tempdir(): References: .. [PodmanStoragePerms] https://podman.io/blogs/2018/10/03/podman-remove-content-homedir.html """ - temp_test_dir = _STATE["temp_test_dir"] + global temp_test_dir + global using_podman if temp_test_dir is not None: - # When podman creates special directories, they cant be cleaned up + # When podman creates special directories, they can't be cleaned up # unless you fake a UID of 0. The package rootlesskit helps with that. - if _STATE["using_podman"]: + if using_podman: subprocess.call(["podman", "unshare", "rm", "-rf", temp_test_dir.name]) - _STATE["temp_test_dir"] = None + temp_test_dir = None def basis_container_kwargs(): @@ -77,6 +77,8 @@ def basis_container_kwargs(): Dict: a configuration passed as ``container_kwargs`` to each parameterized test. """ + global temp_test_dir + global using_podman # TODO: Pytest should be aware of if we are trying to test docker / podman # or not @@ -86,9 +88,9 @@ def basis_container_kwargs(): REQUESTED_DOCKER = HAVE_DOCKER REQUESTED_PODMAN = HAVE_PODMAN - if _STATE["temp_test_dir"] is None: + if temp_test_dir is None: # Only setup the temp directory once for all tests - _STATE["temp_test_dir"] = tempfile.TemporaryDirectory(prefix="cibw_test_") + temp_test_dir = tempfile.TemporaryDirectory(prefix="cibw_test_") if REQUESTED_PODMAN: # Register the special cleanup hook after the temp directory is # created to ensure that it runs before the temp directory logic @@ -96,15 +98,13 @@ def basis_container_kwargs(): # UID). atexit.register(_cleanup_podman_vfs_tempdir) - temp_test_dir = _STATE["temp_test_dir"] - if REQUESTED_DOCKER: # Basic podman configuration yield {"container_engine": "docker", "docker_image": DEFAULT_IMAGE} if REQUESTED_PODMAN: # Basic podman usage - _STATE["using_podman"] = True + using_podman = True yield {"container_engine": "podman", "docker_image": DEFAULT_IMAGE} # VFS Podman usage (for the podman in docker use-case) From 086ead0d6bc6a378d221dc217e8beadd56a43f82 Mon Sep 17 00:00:00 2001 From: joncrall Date: Sun, 26 Jun 2022 17:22:44 -0400 Subject: [PATCH 12/41] remove missing imports --- unit_test/docker_container_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index de14ea38..b4c1d390 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -7,7 +7,7 @@ import subprocess import tempfile import textwrap from pathlib import Path, PurePath, PurePosixPath -from typing import Dict, Optional, Union +from typing import Optional import pytest import toml From a86cabc71617d7fad65f0f9f8a46c71d8b5c74a7 Mon Sep 17 00:00:00 2001 From: joncrall Date: Sun, 26 Jun 2022 17:23:52 -0400 Subject: [PATCH 13/41] forgot to monkeypatch a test --- unit_test/docker_container_test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index b4c1d390..e9629382 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -224,7 +224,9 @@ def test_environment(container_kwargs, monkeypatch): @pytest.mark.docker @pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_cwd(container_kwargs): +def test_cwd(container_kwargs, monkeypatch): + for k, v in container_kwargs.pop("env", {}).items(): + monkeypatch.setenv(k, v) with DockerContainer(cwd="/cibuildwheel/working_directory", **container_kwargs) as container: assert container.call(["pwd"], capture_output=True) == "/cibuildwheel/working_directory\n" assert container.call(["pwd"], capture_output=True, cwd="/opt") == "/opt\n" From fc0db9519855c158267a55bde9efdc767b0f3e18 Mon Sep 17 00:00:00 2001 From: joncrall Date: Sun, 26 Jun 2022 17:35:53 -0400 Subject: [PATCH 14/41] more mypy fixes --- .pre-commit-config.yaml | 1 + unit_test/docker_container_test.py | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 679254fd..e54c6d3b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -67,6 +67,7 @@ repos: - types-jinja2 - types-pyyaml - types-requests + - types-toml - bracex - dataclasses - id: mypy diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index e9629382..c6ac944f 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -7,7 +7,6 @@ import subprocess import tempfile import textwrap from pathlib import Path, PurePath, PurePosixPath -from typing import Optional import pytest import toml @@ -30,7 +29,7 @@ else: DEFAULT_IMAGE = "" # These globals will be manipulated -temp_test_dir: Optional[tempfile.TemporaryDirectory[str]] = None +temp_test_dir = None using_podman = False @@ -56,7 +55,7 @@ def _cleanup_podman_vfs_tempdir(): if temp_test_dir is not None: # When podman creates special directories, they can't be cleaned up # unless you fake a UID of 0. The package rootlesskit helps with that. - if using_podman: + if using_podman: # type: ignore[unreachable] subprocess.call(["podman", "unshare", "rm", "-rf", temp_test_dir.name]) temp_test_dir = None From 8d389467be139f4b0493f8371625c62344cc6ee6 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 14:48:33 +0100 Subject: [PATCH 15/41] Switch to the simpler podman cp implementation The trick is "{src_path}/.". See https://docs.podman.io/en/latest/markdown/podman-cp.1.html#description --- cibuildwheel/docker_container.py | 33 ++------------------------------ 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index cad594d8..f62ee557 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -192,45 +192,16 @@ class DockerContainer: # note: we assume from_path is a dir to_path.mkdir(parents=True, exist_ok=True) - TRY_SIMPLE_CP = 0 - if TRY_SIMPLE_CP: + if self.container_engine == "podman": # There is a bug in docker that prevents this simple implementation # from working https://github.com/moby/moby/issues/38995 - # It seems to also not workin podman as well - command = f"{self.container_engine} cp {self.name}:{shell_quote(from_path)} {shell_quote(to_path)}" + command = f"{self.container_engine} cp {self.name}:{shell_quote(from_path)}/. {shell_quote(to_path)}" subprocess.run( command, shell=True, check=True, cwd=to_path, ) - elif self.container_engine == "podman": - # The copy out logic that works for docker does not seem to - # translate to podman, which seems to need the steps spelled out - # more explicitly. - command = f"{self.container_engine} exec -i {self.name} tar -cC {shell_quote(from_path)} -f /tmp/output-{self.name}.tar ." - subprocess.run( - command, - shell=True, - check=True, - cwd=to_path, - ) - - command = f"{self.container_engine} cp {self.name}:/tmp/output-{self.name}.tar output-{self.name}.tar" - subprocess.run( - command, - shell=True, - check=True, - cwd=to_path, - ) - command = f"tar -xvf output-{self.name}.tar" - subprocess.run( - command, - shell=True, - check=True, - cwd=to_path, - ) - os.unlink(to_path / f"output-{self.name}.tar") elif self.container_engine == "docker": command = f"{self.container_engine} exec -i {self.name} tar -cC {shell_quote(from_path)} -f - . | tar -xf -" subprocess.run( From d9b4644286a9b41172b15fcd2a8b40f16c851dd6 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 15:23:50 +0100 Subject: [PATCH 16/41] Don't need shell for this command --- cibuildwheel/docker_container.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index f62ee557..de41ded9 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -195,10 +195,13 @@ class DockerContainer: if self.container_engine == "podman": # There is a bug in docker that prevents this simple implementation # from working https://github.com/moby/moby/issues/38995 - command = f"{self.container_engine} cp {self.name}:{shell_quote(from_path)}/. {shell_quote(to_path)}" subprocess.run( - command, - shell=True, + [ + self.container_engine, + "cp", + f"{self.name}:{from_path}/.", + str(to_path), + ], check=True, cwd=to_path, ) From 6a371aca73bba6bf37099917a8e0551b8c4f7869 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 16:45:27 +0100 Subject: [PATCH 17/41] Refactor the tests to use --run-docker and --run-podman Simplified test setup using a parameterised fixture. The VFS test is now just a single test that handles its own clean up. --- unit_test/conftest.py | 15 +- unit_test/docker_container_test.py | 349 +++++++++++------------------ 2 files changed, 138 insertions(+), 226 deletions(-) diff --git a/unit_test/conftest.py b/unit_test/conftest.py index 4e22853a..cbfdbb72 100644 --- a/unit_test/conftest.py +++ b/unit_test/conftest.py @@ -8,20 +8,7 @@ MOCK_PACKAGE_DIR = Path("some_package_dir") def pytest_addoption(parser): parser.addoption("--run-docker", action="store_true", default=False, help="run docker tests") - - -def pytest_configure(config): - config.addinivalue_line("markers", "docker: mark test requiring docker to run") - - -def pytest_collection_modifyitems(config, items): - if config.getoption("--run-docker"): - # --run-docker given in cli: do not skip container tests - return - skip_docker = pytest.mark.skip(reason="need --run-docker option to run") - for item in items: - if "docker" in item.keywords: - item.add_marker(skip_docker) + parser.addoption("--run-podman", action="store_true", default=False, help="run podman tests") @pytest.fixture diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index c6ac944f..d8d1f7fb 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -4,6 +4,7 @@ import platform import random import shutil import subprocess +from tabnanny import check import tempfile import textwrap from pathlib import Path, PurePath, PurePosixPath @@ -14,6 +15,8 @@ import toml from cibuildwheel.docker_container import DockerContainer from cibuildwheel.environment import EnvironmentAssignmentBash +# Test utilities + # for these tests we use manylinux2014 images, because they're available on # multi architectures and include python3.8 pm = platform.machine() @@ -28,191 +31,44 @@ elif pm == "s390x": else: DEFAULT_IMAGE = "" -# These globals will be manipulated -temp_test_dir = None -using_podman = False + +@pytest.fixture(params=["docker", "podman"]) +def container_engine(request): + if request.param == "docker" and not request.config.getoption("--run-docker"): + pytest.skip("need --run-docker option to run") + if request.param == "podman" and not request.config.getoption("--run-podman"): + pytest.skip("need --run-podman option to run") + return request.param -# @atexit.register -def _cleanup_podman_vfs_tempdir(): - """ - Cleans up any configuration written by :func:`basis_container_kwargs`. - - For podman tests, the user is not given write permissions by default in new - directories. As a workaround chown them before trying to delete them. - - It may be possible to handle this more cleanly in pytest itself, but using - atexit works well enough for now. - - The reason why permission errors occur on podman is documented in - [PodmanStoragePerms]_. - - References: - .. [PodmanStoragePerms] https://podman.io/blogs/2018/10/03/podman-remove-content-homedir.html - """ - global temp_test_dir - global using_podman - if temp_test_dir is not None: - # When podman creates special directories, they can't be cleaned up - # unless you fake a UID of 0. The package rootlesskit helps with that. - if using_podman: # type: ignore[unreachable] - subprocess.call(["podman", "unshare", "rm", "-rf", temp_test_dir.name]) - temp_test_dir = None +# Tests -def basis_container_kwargs(): - """ - Generate keyword args that can be passed to to :class:`DockerContainer`. - - This is used with :func:`pytest.mark.parametrize` to run each test with - different configurations of each supported containers engine. - - For docker we test the default configuration. - - For podman we test the default configuration and a configuration with VFS - (virtual file system) enabled as the storage driver. - - Yields: - Dict: a configuration passed as ``container_kwargs`` to each - parameterized test. - """ - global temp_test_dir - global using_podman - - # TODO: Pytest should be aware of if we are trying to test docker / podman - # or not - HAVE_DOCKER = bool(shutil.which("docker")) - HAVE_PODMAN = bool(shutil.which("podman")) - - REQUESTED_DOCKER = HAVE_DOCKER - REQUESTED_PODMAN = HAVE_PODMAN - - if temp_test_dir is None: - # Only setup the temp directory once for all tests - temp_test_dir = tempfile.TemporaryDirectory(prefix="cibw_test_") - if REQUESTED_PODMAN: - # Register the special cleanup hook after the temp directory is - # created to ensure that it runs before the temp directory logic - # runs (which will not handle cases where there is a fake root - # UID). - atexit.register(_cleanup_podman_vfs_tempdir) - - if REQUESTED_DOCKER: - # Basic podman configuration - yield {"container_engine": "docker", "docker_image": DEFAULT_IMAGE} - - if REQUESTED_PODMAN: - # Basic podman usage - using_podman = True - yield {"container_engine": "podman", "docker_image": DEFAULT_IMAGE} - - # VFS Podman usage (for the podman in docker use-case) - oci_environ = _setup_podman_vfs(temp_test_dir.name) - yield { - "container_engine": "podman", - "docker_image": DEFAULT_IMAGE, - "env": oci_environ, - } - - -def _setup_podman_vfs(dpath): - """ - Setup the filesystem and environment variables for the VFS podman test - """ - dpath = Path(dpath) - # This requires that we write configuration files and point to them - # with environment variables before we run podman - # https://github.com/containers/common/blob/main/docs/containers.conf.5.md - vfs_containers_conf_data = { - "containers": { - "default_capabilities": [ - "CHOWN", - "DAC_OVERRIDE", - "FOWNER", - "FSETID", - "KILL", - "NET_BIND_SERVICE", - "SETFCAP", - "SETGID", - "SETPCAP", - "SETUID", - "SYS_CHROOT", - ] - }, - "engine": {"cgroup_manager": "cgroupfs", "events_logger": "file"}, - } - # https://github.com/containers/storage/blob/main/docs/containers-storage.conf.5.md - storage_root = dpath / ".local/share/containers/vfs-storage" - run_root = dpath / ".local/share/containers/vfs-runroot" - storage_root.mkdir(parents=True, exist_ok=True) - run_root.mkdir(parents=True, exist_ok=True) - vfs_containers_storage_conf_data = { - "storage": { - "driver": "vfs", - "graphroot": os.fspath(storage_root), - "runroot": os.fspath(run_root), - "rootless_storage_path": os.fspath(storage_root), - "options": { - # "remap-user": "containers", - "aufs": {"mountopt": "rw"}, - "overlay": {"mountopt": "rw", "force_mask": "shared"}, - # "vfs": {"ignore_chown_errors": "true"}, - }, - } - } - vfs_containers_conf_fpath = dpath / "temp_vfs_containers.conf" - vfs_containers_storage_conf_fpath = dpath / "temp_vfs_containers_storage.conf" - with open(vfs_containers_conf_fpath, "w") as file: - toml.dump(vfs_containers_conf_data, file) - - with open(vfs_containers_storage_conf_fpath, "w") as file: - toml.dump(vfs_containers_storage_conf_data, file) - - oci_environ = os.environ.copy() - oci_environ.update( - { - "CONTAINERS_CONF": os.fspath(vfs_containers_conf_fpath), - "CONTAINERS_STORAGE_CONF": os.fspath(vfs_containers_storage_conf_fpath), - } - ) - return oci_environ - - -@pytest.mark.docker -@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_simple(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop("env", {}).items(): - monkeypatch.setenv(k, v) - with DockerContainer(**container_kwargs) as container: +def test_simple(container_engine): + with DockerContainer( + container_engine=container_engine, docker_image=DEFAULT_IMAGE + ) as container: assert container.call(["echo", "hello"], capture_output=True) == "hello\n" -@pytest.mark.docker -@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_no_lf(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop("env", {}).items(): - monkeypatch.setenv(k, v) - with DockerContainer(**container_kwargs) as container: +def test_no_lf(container_engine): + with DockerContainer( + container_engine=container_engine, docker_image=DEFAULT_IMAGE + ) as container: assert container.call(["printf", "hello"], capture_output=True) == "hello" -@pytest.mark.docker -@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_debug_info(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop("env", {}).items(): - monkeypatch.setenv(k, v) - container = DockerContainer(**container_kwargs) +def test_debug_info(container_engine): + container = DockerContainer(container_engine=container_engine, docker_image=DEFAULT_IMAGE) print(container.debug_info()) with container: pass -@pytest.mark.docker -@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_environment(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop("env", {}).items(): - monkeypatch.setenv(k, v) - with DockerContainer(**container_kwargs) as container: +def test_environment(container_engine): + with DockerContainer( + container_engine=container_engine, docker_image=DEFAULT_IMAGE + ) as container: assert ( container.call( ["sh", "-c", "echo $TEST_VAR"], env={"TEST_VAR": "1"}, capture_output=True @@ -221,22 +77,20 @@ def test_environment(container_kwargs, monkeypatch): ) -@pytest.mark.docker -@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_cwd(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop("env", {}).items(): - monkeypatch.setenv(k, v) - with DockerContainer(cwd="/cibuildwheel/working_directory", **container_kwargs) as container: +def test_cwd(container_engine): + with DockerContainer( + container_engine=container_engine, + docker_image=DEFAULT_IMAGE, + cwd="/cibuildwheel/working_directory", + ) as container: assert container.call(["pwd"], capture_output=True) == "/cibuildwheel/working_directory\n" assert container.call(["pwd"], capture_output=True, cwd="/opt") == "/opt\n" -@pytest.mark.docker -@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_container_removed(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop("env", {}).items(): - monkeypatch.setenv(k, v) - with DockerContainer(**container_kwargs) as container: +def test_container_removed(container_engine): + with DockerContainer( + container_engine=container_engine, docker_image=DEFAULT_IMAGE + ) as container: docker_containers_listing = subprocess.run( f"{container.container_engine} container ls", shell=True, @@ -258,11 +112,7 @@ def test_container_removed(container_kwargs, monkeypatch): assert old_container_name not in docker_containers_listing -@pytest.mark.docker -@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_large_environment(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop("env", {}).items(): - monkeypatch.setenv(k, v) +def test_large_environment(container_engine): # max environment variable size is 128kB long_env_var_length = 127 * 1024 large_environment = { @@ -272,7 +122,9 @@ def test_large_environment(container_kwargs, monkeypatch): "d": "0" * long_env_var_length, } - with DockerContainer(**container_kwargs) as container: + with DockerContainer( + container_engine=container_engine, docker_image=DEFAULT_IMAGE + ) as container: # check the length of d assert ( container.call(["sh", "-c", "echo ${#d}"], env=large_environment, capture_output=True) @@ -280,12 +132,10 @@ def test_large_environment(container_kwargs, monkeypatch): ) -@pytest.mark.docker -@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_binary_output(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop("env", {}).items(): - monkeypatch.setenv(k, v) - with DockerContainer(**container_kwargs) as container: +def test_binary_output(container_engine): + with DockerContainer( + container_engine=container_engine, docker_image=DEFAULT_IMAGE + ) as container: # note: the below embedded snippets are in python2 # check that we can pass though arbitrary binary data without erroring @@ -334,12 +184,10 @@ def test_binary_output(container_kwargs, monkeypatch): assert output == binary_data_string -@pytest.mark.docker -@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_file_operation(tmp_path: Path, container_kwargs, monkeypatch): - for k, v in container_kwargs.pop("env", {}).items(): - monkeypatch.setenv(k, v) - with DockerContainer(**container_kwargs) as container: +def test_file_operation(tmp_path: Path, container_engine): + with DockerContainer( + container_engine=container_engine, docker_image=DEFAULT_IMAGE + ) as container: # test copying a file in test_binary_data = bytes(random.randrange(256) for _ in range(1000)) original_test_file = tmp_path / "test.dat" @@ -353,12 +201,10 @@ def test_file_operation(tmp_path: Path, container_kwargs, monkeypatch): assert test_binary_data == bytes(output, encoding="utf8", errors="surrogateescape") -@pytest.mark.docker -@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_dir_operations(tmp_path: Path, container_kwargs, monkeypatch): - for k, v in container_kwargs.pop("env", {}).items(): - monkeypatch.setenv(k, v) - with DockerContainer(**container_kwargs) as container: +def test_dir_operations(tmp_path: Path, container_engine): + with DockerContainer( + container_engine=container_engine, docker_image=DEFAULT_IMAGE + ) as container: test_binary_data = bytes(random.randrange(256) for _ in range(1000)) original_test_file = tmp_path / "test.dat" original_test_file.write_bytes(test_binary_data) @@ -386,11 +232,90 @@ def test_dir_operations(tmp_path: Path, container_kwargs, monkeypatch): assert test_binary_data == (new_test_dir / "test.dat").read_bytes() -@pytest.mark.docker -@pytest.mark.parametrize("container_kwargs", basis_container_kwargs()) -def test_environment_executor(container_kwargs, monkeypatch): - for k, v in container_kwargs.pop("env", {}).items(): - monkeypatch.setenv(k, v) - with DockerContainer(**container_kwargs) as container: +def test_environment_executor(container_engine): + with DockerContainer( + container_engine=container_engine, docker_image=DEFAULT_IMAGE + ) as container: assignment = EnvironmentAssignmentBash("TEST=$(echo 42)") assert assignment.evaluated_value({}, container.environment_executor) == "42" + + +def test_podman_vfs(container_engine, tmp_path: Path, monkeypatch): + # Tests podman VFS, for the podman in docker use-case + if container_engine != "podman": + pytest.skip("podman is the only supported container engine for this test") + + # create the VFS configuration + vfs_path = tmp_path / "podman_vfs" + vfs_path.mkdir() + + # This requires that we write configuration files and point to them + # with environment variables before we run podman + # https://github.com/containers/common/blob/main/docs/containers.conf.5.md + vfs_containers_conf_data = { + "containers": { + "default_capabilities": [ + "CHOWN", + "DAC_OVERRIDE", + "FOWNER", + "FSETID", + "KILL", + "NET_BIND_SERVICE", + "SETFCAP", + "SETGID", + "SETPCAP", + "SETUID", + "SYS_CHROOT", + ] + }, + "engine": {"cgroup_manager": "cgroupfs", "events_logger": "file"}, + } + # https://github.com/containers/storage/blob/main/docs/containers-storage.conf.5.md + storage_root = vfs_path / ".local/share/containers/vfs-storage" + run_root = vfs_path / ".local/share/containers/vfs-runroot" + storage_root.mkdir(parents=True, exist_ok=True) + run_root.mkdir(parents=True, exist_ok=True) + vfs_containers_storage_conf_data = { + "storage": { + "driver": "vfs", + "graphroot": os.fspath(storage_root), + "runroot": os.fspath(run_root), + "rootless_storage_path": os.fspath(storage_root), + "options": { + # "remap-user": "containers", + "aufs": {"mountopt": "rw"}, + "overlay": {"mountopt": "rw", "force_mask": "shared"}, + # "vfs": {"ignore_chown_errors": "true"}, + }, + } + } + + vfs_containers_conf_fpath = vfs_path / "temp_vfs_containers.conf" + vfs_containers_storage_conf_fpath = vfs_path / "temp_vfs_containers_storage.conf" + with open(vfs_containers_conf_fpath, "w") as file: + toml.dump(vfs_containers_conf_data, file) + + with open(vfs_containers_storage_conf_fpath, "w") as file: + toml.dump(vfs_containers_storage_conf_data, file) + + monkeypatch.setenv("CONTAINERS_CONF", str(vfs_containers_conf_fpath)) + monkeypatch.setenv("CONTAINERS_STORAGE_CONF", str(vfs_containers_storage_conf_fpath)) + + with DockerContainer( + container_engine=container_engine, docker_image=DEFAULT_IMAGE + ) as container: + # test running a command + assert container.call(["echo", "hello"], capture_output=True) == "hello\n" + + # test copying a file into the container + (tmp_path / "some_file.txt").write_text("1234") + container.copy_into(tmp_path / "some_file.txt", PurePosixPath("some_file.txt")) + assert container.call(["cat", "some_file.txt"], capture_output=True) == "1234" + + # Clean up + + # When using the VFS, user is not given write permissions by default in + # new directories. As a workaround we use 'podman unshare' to delete them + # as UID 0. The reason why permission errors occur on podman is documented + # in https://podman.io/blogs/2018/10/03/podman-remove-content-homedir.html + subprocess.run(["podman", "unshare", "rm", "-rf", vfs_path], check=True) From 38faa279433f8b1bec0a82edf9293505ab9cf505 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 15:47:31 +0000 Subject: [PATCH 18/41] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- unit_test/docker_container_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index d8d1f7fb..adbc4b55 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -4,10 +4,10 @@ import platform import random import shutil import subprocess -from tabnanny import check import tempfile import textwrap from pathlib import Path, PurePath, PurePosixPath +from tabnanny import check import pytest import toml From de3144a947575da0a13eee4cff82592a35d94c8a Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 16:51:45 +0100 Subject: [PATCH 19/41] Remove unused imports --- unit_test/docker_container_test.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index adbc4b55..59c9fe5e 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -1,13 +1,10 @@ -import atexit import os import platform import random import shutil import subprocess -import tempfile import textwrap from pathlib import Path, PurePath, PurePosixPath -from tabnanny import check import pytest import toml From 3bd759f50c9f0aa3fcfcf51c6720a202d42d2469 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 17:26:31 +0100 Subject: [PATCH 20/41] Add some type safety to the container_engine option --- cibuildwheel/docker_container.py | 10 ++++++---- cibuildwheel/options.py | 13 +++++++++++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index de41ded9..7f01b2fe 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -13,7 +13,9 @@ from typing import IO, Dict, List, Optional, Sequence, Type, cast from cibuildwheel.util import CIProvider, detect_ci_provider -from .typing import PathOrStr, PopenBytes +from .typing import Literal, PathOrStr, PopenBytes + +ContainerEngine = Literal["docker", "podman"] class DockerContainer: @@ -54,7 +56,7 @@ class DockerContainer: docker_image: str, simulate_32_bit: bool = False, cwd: Optional[PathOrStr] = None, - container_engine: str = "docker", + container_engine: ContainerEngine = "docker", ): if not docker_image: raise ValueError("Must have a non-empty docker image to run.") @@ -193,8 +195,6 @@ class DockerContainer: to_path.mkdir(parents=True, exist_ok=True) if self.container_engine == "podman": - # There is a bug in docker that prevents this simple implementation - # from working https://github.com/moby/moby/issues/38995 subprocess.run( [ self.container_engine, @@ -206,6 +206,8 @@ class DockerContainer: cwd=to_path, ) elif self.container_engine == "docker": + # There is a bug in docker that prevents a simple 'cp' invocation + # from working https://github.com/moby/moby/issues/38995 command = f"{self.container_engine} exec -i {self.name} tar -cC {shell_quote(from_path)} -f - . | tar -xf -" subprocess.run( command, diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index 80ee5327..e30cd47f 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -16,6 +16,7 @@ from typing import ( Set, Tuple, Union, + cast, ) if sys.version_info >= (3, 11): @@ -26,6 +27,7 @@ else: from packaging.specifiers import SpecifierSet from .architecture import Architecture +from .docker_container import ContainerEngine from .environment import EnvironmentParseError, ParsedEnvironment, parse_environment from .projectfiles import get_requires_python_str from .typing import PLATFORMS, Literal, PlatformName, TypedDict @@ -79,7 +81,7 @@ class BuildOptions(NamedTuple): test_extras: str build_verbosity: int build_frontend: BuildFrontend - container_engine: str + container_engine: ContainerEngine @property def package_dir(self) -> Path: @@ -423,7 +425,14 @@ class Options: 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_str = self.reader.get("container-engine") + + if container_engine_str not in ["docker", "podman"]: + msg = f"cibuildwheel: Unrecognised container_engine '{container_engine_str}', only 'docker' and 'podman' are supported" + print(msg, file=sys.stderr) + sys.exit(2) + + container_engine = cast(ContainerEngine, container_engine_str) build_frontend: BuildFrontend if build_frontend_str == "build": From 2457006796a8dec7fe92b51075c237109d2e348b Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 17:32:40 +0100 Subject: [PATCH 21/41] Make container-engine a global option, since that's how its being used --- cibuildwheel/linux.py | 21 +++++++++++++-------- cibuildwheel/options.py | 21 +++++++++++---------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index e89a35b6..2939bd18 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -16,6 +16,7 @@ from .util import ( get_build_verbosity_extra_flags, prepare_command, read_python_configs, + unwrap, ) @@ -320,18 +321,22 @@ def build_on_docker( def build(options: Options, tmp_path: Path) -> None: # pylint: disable=unused-argument - - build_opts = options.build_options(None) try: - # check docker is installed + # check the container engine is installed subprocess.run( - [build_opts.container_engine, "--version"], check=True, stdout=subprocess.DEVNULL + [options.globals.container_engine, "--version"], check=True, stdout=subprocess.DEVNULL ) except subprocess.CalledProcessError: print( - f"cibuildwheel: {build_opts.container_engine} not found. An OCI exe like Docker or Podman is required to run Linux builds " - "If you're building on Travis CI, add `services: [docker]` to your .travis.yml." - "If you're building on Circle CI in Linux, add a `setup_remote_docker` step to your .circleci/config.yml", + unwrap( + f""" + cibuildwheel: {options.globals.container_engine} not found. An + OCI exe like Docker or Podman is required to run Linux builds. + If you're building on Travis CI, add `services: [docker]` to + your .travis.yml. If you're building on Circle CI in Linux, + add a `setup_remote_docker` step to your .circleci/config.yml. + """ + ), file=sys.stderr, ) sys.exit(2) @@ -359,7 +364,7 @@ def build(options: Options, tmp_path: Path) -> None: # pylint: disable=unused-a docker_image=build_step.docker_image, simulate_32_bit=build_step.platform_tag.endswith("i686"), cwd=container_project_path, - container_engine=build_opts.container_engine, + container_engine=options.globals.container_engine, ) as docker: build_on_docker( diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index e30cd47f..4bed523d 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -64,6 +64,7 @@ class GlobalOptions(NamedTuple): build_selector: BuildSelector test_selector: TestSelector architectures: Set[Architecture] + container_engine: ContainerEngine class BuildOptions(NamedTuple): @@ -81,7 +82,6 @@ class BuildOptions(NamedTuple): test_extras: str build_verbosity: int build_frontend: BuildFrontend - container_engine: ContainerEngine @property def package_dir(self) -> Path: @@ -395,12 +395,22 @@ class Options: archs_config_str = args.archs or self.reader.get("archs", sep=" ") architectures = Architecture.parse_config(archs_config_str, platform=self.platform) + container_engine_str = self.reader.get("container-engine") + + if container_engine_str not in ["docker", "podman"]: + msg = f"cibuildwheel: Unrecognised container_engine '{container_engine_str}', only 'docker' and 'podman' are supported" + print(msg, file=sys.stderr) + sys.exit(2) + + container_engine = cast(ContainerEngine, container_engine_str) + return GlobalOptions( package_dir=package_dir, output_dir=output_dir, build_selector=build_selector, test_selector=test_selector, architectures=architectures, + container_engine=container_engine, ) def build_options(self, identifier: Optional[str]) -> BuildOptions: @@ -425,14 +435,6 @@ class Options: 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_str = self.reader.get("container-engine") - - if container_engine_str not in ["docker", "podman"]: - msg = f"cibuildwheel: Unrecognised container_engine '{container_engine_str}', only 'docker' and 'podman' are supported" - print(msg, file=sys.stderr) - sys.exit(2) - - container_engine = cast(ContainerEngine, container_engine_str) build_frontend: BuildFrontend if build_frontend_str == "build": @@ -531,7 +533,6 @@ class Options: manylinux_images=manylinux_images or None, musllinux_images=musllinux_images or None, build_frontend=build_frontend, - container_engine=container_engine, ) def check_for_invalid_configuration(self, identifiers: List[str]) -> None: From 1d2e5d5d8ff5aba545aa582d22221272be934abf Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 17:46:22 +0100 Subject: [PATCH 22/41] Rename DockerContainer -> OCIContainer, and a few other things OCIContainer.container_engine -> OCIContainer.engine OCIContainer.docker_image -> OCIContainer.image Variables that refer to 'docker_images' have been renamed to 'container_images' --- cibuildwheel/docker_container.py | 57 +++++++++++------------ cibuildwheel/linux.py | 24 +++++----- cibuildwheel/options.py | 16 +++---- unit_test/docker_container_test.py | 54 +++++++-------------- unit_test/linux_build_steps_test.py | 14 +++--- unit_test/main_tests/main_options_test.py | 4 +- unit_test/option_prepare_test.py | 22 ++++----- unit_test/options_test.py | 10 ++-- 8 files changed, 89 insertions(+), 112 deletions(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index 7f01b2fe..b910c497 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -18,26 +18,23 @@ from .typing import Literal, PathOrStr, PopenBytes ContainerEngine = Literal["docker", "podman"] -class DockerContainer: +class OCIContainer: """ - An object that represents a running Docker container. + An object that represents a running OCI (e.g. Docker) container. Intended for use as a context manager e.g. - `with DockerContainer(docker_image = 'ubuntu') as docker:` + `with OCIContainer(image = 'ubuntu') as docker:` A bash shell is running in the remote container. When `call()` is invoked, the command is relayed to the remote shell, and the results are streamed back to cibuildwheel. - TODO: - - [ ] Rename to Container as this now generalizes docker and podman? - Example: >>> from cibuildwheel.docker_container import * # NOQA - >>> from cibuildwheel.options import _get_pinned_docker_images - >>> docker_image = _get_pinned_docker_images()['x86_64']['manylinux2014'] + >>> from cibuildwheel.options import _get_pinned_container_images + >>> image = _get_pinned_container_images()['x86_64']['manylinux2014'] >>> # Test the default container - >>> with DockerContainer(docker_image=docker_image) as self: + >>> with OCIContainer(image=image) as self: ... self.call(["echo", "hello world"]) ... self.call(["cat", "/proc/1/cgroup"]) ... print(self.get_environment()) @@ -53,21 +50,21 @@ class DockerContainer: def __init__( self, *, - docker_image: str, + image: str, simulate_32_bit: bool = False, cwd: Optional[PathOrStr] = None, - container_engine: ContainerEngine = "docker", + engine: ContainerEngine = "docker", ): - if not docker_image: + if not image: raise ValueError("Must have a non-empty docker image to run.") - self.docker_image = docker_image + self.image = image self.simulate_32_bit = simulate_32_bit self.cwd = cwd self.name: Optional[str] = None - self.container_engine = container_engine + self.engine = engine - def __enter__(self) -> "DockerContainer": + def __enter__(self) -> "OCIContainer": self.name = f"cibuildwheel-{uuid.uuid4()}" @@ -83,14 +80,14 @@ class DockerContainer: subprocess.run( [ - self.container_engine, + self.engine, "create", "--env=CIBUILDWHEEL", f"--name={self.name}", "--interactive", "--volume=/:/host", # ignored on CircleCI *network_args, - self.docker_image, + self.image, *shell_args, ], check=True, @@ -98,7 +95,7 @@ class DockerContainer: self.process = subprocess.Popen( [ - self.container_engine, + self.engine, "start", "--attach", "--interactive", @@ -136,7 +133,7 @@ class DockerContainer: self.bash_stdin.close() self.bash_stdout.close() - if self.container_engine == "podman": + if self.engine == "podman": # This works around what seems to be a race condition in the podman # backend. The full reason is not understood. See PR #966 for a # discussion on possible causes and attempts to remove this line. @@ -146,7 +143,7 @@ class DockerContainer: assert isinstance(self.name, str) subprocess.run( - [self.container_engine, "rm", "--force", "-v", self.name], + [self.engine, "rm", "--force", "-v", self.name], stdout=subprocess.DEVNULL, check=False, ) @@ -161,7 +158,7 @@ class DockerContainer: if from_path.is_dir(): self.call(["mkdir", "-p", to_path]) subprocess.run( - f"tar cf - . | {self.container_engine} exec -i {self.name} tar --no-same-owner -xC {shell_quote(to_path)} -f -", + f"tar cf - . | {self.engine} exec -i {self.name} tar --no-same-owner -xC {shell_quote(to_path)} -f -", shell=True, check=True, cwd=from_path, @@ -169,7 +166,7 @@ class DockerContainer: else: with subprocess.Popen( [ - self.container_engine, + self.engine, "exec", "-i", str(self.name), @@ -194,10 +191,10 @@ class DockerContainer: # note: we assume from_path is a dir to_path.mkdir(parents=True, exist_ok=True) - if self.container_engine == "podman": + if self.engine == "podman": subprocess.run( [ - self.container_engine, + self.engine, "cp", f"{self.name}:{from_path}/.", str(to_path), @@ -205,10 +202,10 @@ class DockerContainer: check=True, cwd=to_path, ) - elif self.container_engine == "docker": + elif self.engine == "docker": # There is a bug in docker that prevents a simple 'cp' invocation # from working https://github.com/moby/moby/issues/38995 - command = f"{self.container_engine} exec -i {self.name} tar -cC {shell_quote(from_path)} -f - . | tar -xf -" + command = f"{self.engine} exec -i {self.name} tar -cC {shell_quote(from_path)} -f - . | tar -xf -" subprocess.run( command, shell=True, @@ -216,7 +213,7 @@ class DockerContainer: cwd=to_path, ) else: - raise KeyError(self.container_engine) + raise KeyError(self.engine) def glob(self, path: PurePosixPath, pattern: str) -> List[PurePosixPath]: glob_pattern = path.joinpath(pattern) @@ -333,10 +330,10 @@ class DockerContainer: return self.call(command, env=environment, capture_output=True) def debug_info(self) -> str: - if self.container_engine == "podman": - command = f"{self.container_engine} info --debug" + if self.engine == "podman": + command = f"{self.engine} info --debug" else: - command = f"{self.container_engine} info" + command = f"{self.engine} info" completed = subprocess.run( command, shell=True, diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 2939bd18..d4eacaef 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -5,7 +5,7 @@ from pathlib import Path, PurePath, PurePosixPath from typing import Iterator, List, NamedTuple, Set, Tuple from .architecture import Architecture -from .docker_container import DockerContainer +from .docker_container import OCIContainer from .logger import log from .options import Options from .typing import OrderedDict, PathOrStr, assert_never @@ -33,7 +33,7 @@ class PythonConfiguration(NamedTuple): class BuildStep(NamedTuple): platform_configs: List[PythonConfiguration] platform_tag: str - docker_image: str + container_image: str def get_python_configurations( @@ -55,7 +55,7 @@ def get_python_configurations( ] -def docker_image_for_python_configuration(config: PythonConfiguration, options: Options) -> str: +def container_image_for_python_configuration(config: PythonConfiguration, options: Options) -> str: build_options = options.build_options(config.identifier) # e.g # identifier is 'cp310-manylinux_x86_64' @@ -87,15 +87,17 @@ def get_build_steps( _, platform_tag = config.identifier.split("-", 1) before_all = options.build_options(config.identifier).before_all - docker_image = docker_image_for_python_configuration(config, options) + container_image = container_image_for_python_configuration(config, options) - step_key = (platform_tag, docker_image, before_all) + step_key = (platform_tag, container_image, before_all) if step_key in steps: steps[step_key].platform_configs.append(config) else: steps[step_key] = BuildStep( - platform_configs=[config], platform_tag=platform_tag, docker_image=docker_image + platform_configs=[config], + platform_tag=platform_tag, + container_image=container_image, ) yield from steps.values() @@ -105,7 +107,7 @@ def build_on_docker( *, options: Options, platform_configs: List[PythonConfiguration], - docker: DockerContainer, + docker: OCIContainer, container_project_path: PurePath, container_package_dir: PurePath, ) -> None: @@ -357,14 +359,14 @@ def build(options: Options, tmp_path: Path) -> None: # pylint: disable=unused-a try: ids_to_build = [x.identifier for x in build_step.platform_configs] log.step( - f"Starting Docker image {build_step.docker_image} for {', '.join(ids_to_build)}..." + f"Starting Docker image {build_step.container_image} for {', '.join(ids_to_build)}..." ) - with DockerContainer( - docker_image=build_step.docker_image, + with OCIContainer( + image=build_step.container_image, simulate_32_bit=build_step.platform_tag.endswith("i686"), cwd=container_project_path, - container_engine=options.globals.container_engine, + engine=options.globals.container_engine, ) as docker: build_on_docker( diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index 4bed523d..df4114e2 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -485,10 +485,10 @@ class Options: manylinux_images: Dict[str, str] = {} musllinux_images: Dict[str, str] = {} if self.platform == "linux": - all_pinned_docker_images = _get_pinned_docker_images() + all_pinned_container_images = _get_pinned_container_images() for build_platform in MANYLINUX_ARCHS: - pinned_images = all_pinned_docker_images[build_platform] + pinned_images = all_pinned_container_images[build_platform] config_value = self.reader.get( f"manylinux-{build_platform}-image", ignore_empty=True @@ -505,7 +505,7 @@ class Options: manylinux_images[build_platform] = image for build_platform in MUSLLINUX_ARCHS: - pinned_images = all_pinned_docker_images[build_platform] + pinned_images = all_pinned_container_images[build_platform] config_value = self.reader.get(f"musllinux-{build_platform}-image") @@ -591,7 +591,7 @@ def compute_options( @functools.lru_cache(maxsize=None) -def _get_pinned_docker_images() -> Mapping[str, Mapping[str, str]]: +def _get_pinned_container_images() -> Mapping[str, Mapping[str, str]]: """ This looks like a dict of dicts, e.g. { 'x86_64': {'manylinux1': '...', 'manylinux2010': '...', 'manylinux2014': '...'}, @@ -600,10 +600,10 @@ def _get_pinned_docker_images() -> Mapping[str, Mapping[str, str]]: ... } """ - pinned_docker_images_file = resources_dir / "pinned_docker_images.cfg" - all_pinned_docker_images = ConfigParser() - all_pinned_docker_images.read(pinned_docker_images_file) - return all_pinned_docker_images + pinned_images_file = resources_dir / "pinned_docker_images.cfg" + all_pinned_images = ConfigParser() + all_pinned_images.read(pinned_images_file) + return all_pinned_images def deprecated_selectors(name: str, selector: str, *, error: bool = False) -> None: diff --git a/unit_test/docker_container_test.py b/unit_test/docker_container_test.py index 59c9fe5e..e4252b03 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/docker_container_test.py @@ -9,7 +9,7 @@ from pathlib import Path, PurePath, PurePosixPath import pytest import toml -from cibuildwheel.docker_container import DockerContainer +from cibuildwheel.docker_container import OCIContainer from cibuildwheel.environment import EnvironmentAssignmentBash # Test utilities @@ -42,30 +42,24 @@ def container_engine(request): def test_simple(container_engine): - with DockerContainer( - container_engine=container_engine, docker_image=DEFAULT_IMAGE - ) as container: + with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: assert container.call(["echo", "hello"], capture_output=True) == "hello\n" def test_no_lf(container_engine): - with DockerContainer( - container_engine=container_engine, docker_image=DEFAULT_IMAGE - ) as container: + with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: assert container.call(["printf", "hello"], capture_output=True) == "hello" def test_debug_info(container_engine): - container = DockerContainer(container_engine=container_engine, docker_image=DEFAULT_IMAGE) + container = OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) print(container.debug_info()) with container: pass def test_environment(container_engine): - with DockerContainer( - container_engine=container_engine, docker_image=DEFAULT_IMAGE - ) as container: + with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: assert ( container.call( ["sh", "-c", "echo $TEST_VAR"], env={"TEST_VAR": "1"}, capture_output=True @@ -75,21 +69,17 @@ def test_environment(container_engine): def test_cwd(container_engine): - with DockerContainer( - container_engine=container_engine, - docker_image=DEFAULT_IMAGE, - cwd="/cibuildwheel/working_directory", + with OCIContainer( + engine=container_engine, image=DEFAULT_IMAGE, cwd="/cibuildwheel/working_directory" ) as container: assert container.call(["pwd"], capture_output=True) == "/cibuildwheel/working_directory\n" assert container.call(["pwd"], capture_output=True, cwd="/opt") == "/opt\n" def test_container_removed(container_engine): - with DockerContainer( - container_engine=container_engine, docker_image=DEFAULT_IMAGE - ) as container: + with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: docker_containers_listing = subprocess.run( - f"{container.container_engine} container ls", + f"{container.engine} container ls", shell=True, check=True, stdout=subprocess.PIPE, @@ -100,7 +90,7 @@ def test_container_removed(container_engine): old_container_name = container.name docker_containers_listing = subprocess.run( - f"{container.container_engine} container ls", + f"{container.engine} container ls", shell=True, check=True, stdout=subprocess.PIPE, @@ -119,9 +109,7 @@ def test_large_environment(container_engine): "d": "0" * long_env_var_length, } - with DockerContainer( - container_engine=container_engine, docker_image=DEFAULT_IMAGE - ) as container: + with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: # check the length of d assert ( container.call(["sh", "-c", "echo ${#d}"], env=large_environment, capture_output=True) @@ -130,9 +118,7 @@ def test_large_environment(container_engine): def test_binary_output(container_engine): - with DockerContainer( - container_engine=container_engine, docker_image=DEFAULT_IMAGE - ) as container: + with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: # note: the below embedded snippets are in python2 # check that we can pass though arbitrary binary data without erroring @@ -182,9 +168,7 @@ def test_binary_output(container_engine): def test_file_operation(tmp_path: Path, container_engine): - with DockerContainer( - container_engine=container_engine, docker_image=DEFAULT_IMAGE - ) as container: + with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: # test copying a file in test_binary_data = bytes(random.randrange(256) for _ in range(1000)) original_test_file = tmp_path / "test.dat" @@ -199,9 +183,7 @@ def test_file_operation(tmp_path: Path, container_engine): def test_dir_operations(tmp_path: Path, container_engine): - with DockerContainer( - container_engine=container_engine, docker_image=DEFAULT_IMAGE - ) as container: + with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: test_binary_data = bytes(random.randrange(256) for _ in range(1000)) original_test_file = tmp_path / "test.dat" original_test_file.write_bytes(test_binary_data) @@ -230,9 +212,7 @@ def test_dir_operations(tmp_path: Path, container_engine): def test_environment_executor(container_engine): - with DockerContainer( - container_engine=container_engine, docker_image=DEFAULT_IMAGE - ) as container: + with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: assignment = EnvironmentAssignmentBash("TEST=$(echo 42)") assert assignment.evaluated_value({}, container.environment_executor) == "42" @@ -298,9 +278,7 @@ def test_podman_vfs(container_engine, tmp_path: Path, monkeypatch): monkeypatch.setenv("CONTAINERS_CONF", str(vfs_containers_conf_fpath)) monkeypatch.setenv("CONTAINERS_STORAGE_CONF", str(vfs_containers_storage_conf_fpath)) - with DockerContainer( - container_engine=container_engine, docker_image=DEFAULT_IMAGE - ) as container: + with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: # test running a command assert container.call(["echo", "hello"], capture_output=True) == "hello\n" diff --git a/unit_test/linux_build_steps_test.py b/unit_test/linux_build_steps_test.py index 29bc65a4..fd8f1788 100644 --- a/unit_test/linux_build_steps_test.py +++ b/unit_test/linux_build_steps_test.py @@ -21,16 +21,16 @@ def test_linux_container_split(tmp_path: Path, monkeypatch): textwrap.dedent( """ [tool.cibuildwheel] - manylinux-x86_64-image = "normal_docker_image" - manylinux-i686-image = "normal_docker_image" + manylinux-x86_64-image = "normal_container_image" + manylinux-i686-image = "normal_container_image" build = "*-manylinux_x86_64" skip = "pp*" archs = "x86_64 i686" [[tool.cibuildwheel.overrides]] select = "cp{38,39,310}-*" - manylinux-x86_64-image = "other_docker_image" - manylinux-i686-image = "other_docker_image" + manylinux-x86_64-image = "other_container_image" + manylinux-i686-image = "other_container_image" [[tool.cibuildwheel.overrides]] select = "cp39-*" @@ -57,14 +57,14 @@ def test_linux_container_split(tmp_path: Path, monkeypatch): pprint(build_steps) - assert build_steps[0].docker_image == "normal_docker_image" + assert build_steps[0].container_image == "normal_container_image" assert identifiers(build_steps[0]) == ["cp36-manylinux_x86_64", "cp37-manylinux_x86_64"] assert before_alls(build_steps[0]) == ["", ""] - assert build_steps[1].docker_image == "other_docker_image" + assert build_steps[1].container_image == "other_container_image" assert identifiers(build_steps[1]) == ["cp38-manylinux_x86_64", "cp310-manylinux_x86_64"] assert before_alls(build_steps[1]) == ["", ""] - assert build_steps[2].docker_image == "other_docker_image" + assert build_steps[2].container_image == "other_container_image" assert identifiers(build_steps[2]) == ["cp39-manylinux_x86_64"] assert before_alls(build_steps[2]) == ["echo 'a cp39-only command'"] diff --git a/unit_test/main_tests/main_options_test.py b/unit_test/main_tests/main_options_test.py index 27a97a2e..59368de5 100644 --- a/unit_test/main_tests/main_options_test.py +++ b/unit_test/main_tests/main_options_test.py @@ -11,7 +11,7 @@ else: from cibuildwheel.__main__ import main from cibuildwheel.environment import ParsedEnvironment -from cibuildwheel.options import BuildOptions, _get_pinned_docker_images +from cibuildwheel.options import BuildOptions, _get_pinned_container_images from cibuildwheel.util import BuildSelector, resources_dir # CIBW_PLATFORM is tested in main_platform_test.py @@ -339,6 +339,6 @@ def test_defaults(platform, intercepted_build_args): if platform == "linux": assert build_options.manylinux_images - pinned_images = _get_pinned_docker_images() + pinned_images = _get_pinned_container_images() default_x86_64_image = pinned_images["x86_64"][defaults["manylinux-x86_64-image"]] assert build_options.manylinux_images["x86_64"] == default_x86_64_image diff --git a/unit_test/option_prepare_test.py b/unit_test/option_prepare_test.py index 5f2fecfd..903746d4 100644 --- a/unit_test/option_prepare_test.py +++ b/unit_test/option_prepare_test.py @@ -35,7 +35,7 @@ def mock_build_docker(monkeypatch): monkeypatch.setattr(subprocess, "Popen", fail_on_call) monkeypatch.setattr(subprocess, "run", ignore_call) monkeypatch.setattr(util, "download", fail_on_call) - monkeypatch.setattr("cibuildwheel.linux.DockerContainer", ignore_context_call) + monkeypatch.setattr("cibuildwheel.linux.OCIContainer", ignore_context_call) monkeypatch.setattr("cibuildwheel.linux.build_on_docker", mock.Mock(spec=linux.build_on_docker)) monkeypatch.setattr("cibuildwheel.util.print_new_wheels", ignore_context_call) @@ -52,7 +52,7 @@ def test_build_default_launches(mock_build_docker, fake_package_dir, monkeypatch # In Python 3.8+, this can be simplified to [0].kwargs kwargs = build_on_docker.call_args_list[0][1] - assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["docker_image"] + assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["image"] assert kwargs["docker"]["cwd"] == PurePosixPath("/project") assert not kwargs["docker"]["simulate_32_bit"] @@ -60,7 +60,7 @@ def test_build_default_launches(mock_build_docker, fake_package_dir, monkeypatch assert identifiers == {f"{x}-manylinux_x86_64" for x in ALL_IDS} kwargs = build_on_docker.call_args_list[1][1] - assert "quay.io/pypa/manylinux2014_i686" in kwargs["docker"]["docker_image"] + assert "quay.io/pypa/manylinux2014_i686" in kwargs["docker"]["image"] assert kwargs["docker"]["cwd"] == PurePosixPath("/project") assert kwargs["docker"]["simulate_32_bit"] @@ -68,7 +68,7 @@ def test_build_default_launches(mock_build_docker, fake_package_dir, monkeypatch assert identifiers == {f"{x}-manylinux_i686" for x in ALL_IDS} kwargs = build_on_docker.call_args_list[2][1] - assert "quay.io/pypa/musllinux_1_1_x86_64" in kwargs["docker"]["docker_image"] + assert "quay.io/pypa/musllinux_1_1_x86_64" in kwargs["docker"]["image"] assert kwargs["docker"]["cwd"] == PurePosixPath("/project") assert not kwargs["docker"]["simulate_32_bit"] @@ -78,7 +78,7 @@ def test_build_default_launches(mock_build_docker, fake_package_dir, monkeypatch } kwargs = build_on_docker.call_args_list[3][1] - assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["docker"]["docker_image"] + assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["docker"]["image"] assert kwargs["docker"]["cwd"] == PurePosixPath("/project") assert kwargs["docker"]["simulate_32_bit"] @@ -118,7 +118,7 @@ before-all = "true" assert build_on_docker.call_count == 6 kwargs = build_on_docker.call_args_list[0][1] - assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["docker_image"] + assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["image"] assert kwargs["docker"]["cwd"] == PurePosixPath("/project") assert not kwargs["docker"]["simulate_32_bit"] @@ -127,7 +127,7 @@ before-all = "true" assert kwargs["options"].build_options("cp36-manylinux_x86_64").before_all == "true" kwargs = build_on_docker.call_args_list[1][1] - assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["docker_image"] + assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["image"] assert kwargs["docker"]["cwd"] == PurePosixPath("/project") assert not kwargs["docker"]["simulate_32_bit"] @@ -138,7 +138,7 @@ before-all = "true" assert kwargs["options"].build_options("cp37-manylinux_x86_64").before_all == "" kwargs = build_on_docker.call_args_list[2][1] - assert "quay.io/pypa/manylinux_2_24_x86_64" in kwargs["docker"]["docker_image"] + assert "quay.io/pypa/manylinux_2_24_x86_64" in kwargs["docker"]["image"] assert kwargs["docker"]["cwd"] == PurePosixPath("/project") assert not kwargs["docker"]["simulate_32_bit"] identifiers = {x.identifier for x in kwargs["platform_configs"]} @@ -150,7 +150,7 @@ before-all = "true" } kwargs = build_on_docker.call_args_list[3][1] - assert "quay.io/pypa/manylinux2014_i686" in kwargs["docker"]["docker_image"] + assert "quay.io/pypa/manylinux2014_i686" in kwargs["docker"]["image"] assert kwargs["docker"]["cwd"] == PurePosixPath("/project") assert kwargs["docker"]["simulate_32_bit"] @@ -158,7 +158,7 @@ before-all = "true" assert identifiers == {f"{x}-manylinux_i686" for x in ALL_IDS} kwargs = build_on_docker.call_args_list[4][1] - assert "quay.io/pypa/musllinux_1_1_x86_64" in kwargs["docker"]["docker_image"] + assert "quay.io/pypa/musllinux_1_1_x86_64" in kwargs["docker"]["image"] assert kwargs["docker"]["cwd"] == PurePosixPath("/project") assert not kwargs["docker"]["simulate_32_bit"] @@ -168,7 +168,7 @@ before-all = "true" } kwargs = build_on_docker.call_args_list[5][1] - assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["docker"]["docker_image"] + assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["docker"]["image"] assert kwargs["docker"]["cwd"] == PurePosixPath("/project") assert kwargs["docker"]["simulate_32_bit"] diff --git a/unit_test/options_test.py b/unit_test/options_test.py index fd8a102f..3ce8b214 100644 --- a/unit_test/options_test.py +++ b/unit_test/options_test.py @@ -4,7 +4,7 @@ import pytest from cibuildwheel.__main__ import get_build_identifiers from cibuildwheel.environment import parse_environment -from cibuildwheel.options import Options, _get_pinned_docker_images +from cibuildwheel.options import Options, _get_pinned_container_images from .utils import get_default_command_line_arguments @@ -58,18 +58,18 @@ test_command: 'pyproject' assert default_build_options.environment == parse_environment('FOO="BAR"') - all_pinned_docker_images = _get_pinned_docker_images() - pinned_x86_64_docker_image = all_pinned_docker_images["x86_64"] + all_pinned_container_images = _get_pinned_container_images() + pinned_x86_64_container_image = all_pinned_container_images["x86_64"] local = options.build_options("cp38-manylinux_x86_64") assert local.manylinux_images is not None assert local.test_command == "pyproject" - assert local.manylinux_images["x86_64"] == pinned_x86_64_docker_image["manylinux1"] + assert local.manylinux_images["x86_64"] == pinned_x86_64_container_image["manylinux1"] local = options.build_options("cp37-manylinux_x86_64") assert local.manylinux_images is not None assert local.test_command == "pyproject-override" - assert local.manylinux_images["x86_64"] == pinned_x86_64_docker_image["manylinux2014"] + assert local.manylinux_images["x86_64"] == pinned_x86_64_container_image["manylinux2014"] def test_passthrough(tmp_path, monkeypatch): From d66c1e92bfce01eddb245714c83948400fcbab3a Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 18:30:49 +0100 Subject: [PATCH 23/41] Lots more naming changes to reflect that containers are not necessarily 'docker' --- cibuildwheel/__main__.py | 5 +- cibuildwheel/architecture.py | 2 +- cibuildwheel/linux.py | 86 ++++++++-------- .../{docker_container.py => oci_container.py} | 18 ++-- cibuildwheel/options.py | 2 +- docs/diagram.md | 6 +- docs/faq.md | 10 +- docs/options.md | 18 ++-- ...ker_images.py => test_container_images.py} | 0 test/test_manylinuxXXXX_only.py | 2 +- unit_test/linux_build_steps_test.py | 4 +- ...ontainer_test.py => oci_container_test.py} | 2 +- unit_test/option_prepare_test.py | 98 ++++++++++--------- 13 files changed, 129 insertions(+), 124 deletions(-) rename cibuildwheel/{docker_container.py => oci_container.py} (95%) rename test/{test_docker_images.py => test_container_images.py} (100%) rename unit_test/{docker_container_test.py => oci_container_test.py} (99%) diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index f8158b31..03b18a20 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -46,7 +46,7 @@ def main() -> None: auto-detected platform or to run cibuildwheel on your development machine. Specifying "macos" or "windows" only works on that operating system, but "linux" works on all three, as long as - Docker is installed. Default: auto. + Docker/Podman is installed. Default: auto. """, ) @@ -91,7 +91,7 @@ def main() -> None: Path to the package that you want wheels for. Default: the working directory. Can be a directory inside the working directory, or an sdist. When set to a directory, the working directory is still - considered the 'project' and is copied into the Docker container + considered the 'project' and is copied into the build container on Linux. When set to a tar.gz sdist file, --config-file and --output-dir are relative to the current directory, and other paths are relative to the expanded SDist directory. @@ -208,7 +208,6 @@ def build_in_directory(args: CommandLineArguments) -> None: sys.exit(0) # Add CIBUILDWHEEL environment variable - # This needs to be passed on to the docker container in linux.py os.environ["CIBUILDWHEEL"] = "1" # Python is buffering by default when running on the CI platforms, giving problems interleaving subprocess call output with unflushed calls to 'print' diff --git a/cibuildwheel/architecture.py b/cibuildwheel/architecture.py index 437ff5e8..be87f321 100644 --- a/cibuildwheel/architecture.py +++ b/cibuildwheel/architecture.py @@ -59,7 +59,7 @@ class Architecture(Enum): result = {native_architecture} if platform == "linux" and native_architecture == Architecture.x86_64: - # x86_64 machines can run i686 docker containers + # x86_64 machines can run i686 containers result.add(Architecture.i686) if platform == "windows" and native_architecture == Architecture.AMD64: diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index d4eacaef..fe694a7f 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -5,8 +5,8 @@ from pathlib import Path, PurePath, PurePosixPath from typing import Iterator, List, NamedTuple, Set, Tuple from .architecture import Architecture -from .docker_container import OCIContainer from .logger import log +from .oci_container import OCIContainer from .options import Options from .typing import OrderedDict, PathOrStr, assert_never from .util import ( @@ -79,7 +79,7 @@ def get_build_steps( ) -> Iterator[BuildStep]: """ Groups PythonConfigurations into BuildSteps. Each BuildStep represents a - separate Docker container. + separate container instance. """ steps = OrderedDict[Tuple[str, str, str], BuildStep]() @@ -103,18 +103,18 @@ def get_build_steps( yield from steps.values() -def build_on_docker( +def build_in_container( *, options: Options, platform_configs: List[PythonConfiguration], - docker: OCIContainer, + container: OCIContainer, container_project_path: PurePath, container_package_dir: PurePath, ) -> None: container_output_dir = PurePosixPath("/output") - log.step("Copying project into Docker...") - docker.copy_into(Path.cwd(), container_project_path) + log.step("Copying project into container...") + container.copy_into(Path.cwd(), container_project_path) before_all_options_identifier = platform_configs[0].identifier before_all_options = options.build_options(before_all_options_identifier) @@ -122,11 +122,11 @@ def build_on_docker( if before_all_options.before_all: log.step("Running before_all...") - env = docker.get_environment() + env = container.get_environment() env["PATH"] = f'/opt/python/cp38-cp38/bin:{env["PATH"]}' env["PIP_DISABLE_PIP_VERSION_CHECK"] = "1" env = before_all_options.environment.as_dictionary( - env, executor=docker.environment_executor + env, executor=container.environment_executor ) before_all_prepared = prepare_command( @@ -134,7 +134,7 @@ def build_on_docker( project=container_project_path, package=container_package_dir, ) - docker.call(["sh", "-c", before_all_prepared], env=env) + container.call(["sh", "-c", before_all_prepared], env=env) built_wheels: List[PurePosixPath] = [] @@ -150,21 +150,21 @@ def build_on_docker( ) container_constraints_file = PurePath("/constraints.txt") - docker.copy_into(constraints_file, container_constraints_file) + container.copy_into(constraints_file, container_constraints_file) dependency_constraint_flags = ["-c", container_constraints_file] log.step("Setting up build environment...") - env = docker.get_environment() + env = container.get_environment() # put this config's python top of the list python_bin = config.path / "bin" env["PATH"] = f'{python_bin}:{env["PATH"]}' - env = build_options.environment.as_dictionary(env, executor=docker.environment_executor) + env = build_options.environment.as_dictionary(env, executor=container.environment_executor) # check config python is still on PATH - which_python = docker.call(["which", "python"], env=env, capture_output=True).strip() + which_python = container.call(["which", "python"], env=env, capture_output=True).strip() if PurePosixPath(which_python) != python_bin / "python": print( "cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", @@ -172,7 +172,7 @@ def build_on_docker( ) sys.exit(1) - which_pip = docker.call(["which", "pip"], env=env, capture_output=True).strip() + which_pip = container.call(["which", "pip"], env=env, capture_output=True).strip() if PurePosixPath(which_pip) != python_bin / "pip": print( "cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.", @@ -196,19 +196,19 @@ def build_on_docker( project=container_project_path, package=container_package_dir, ) - docker.call(["sh", "-c", before_build_prepared], env=env) + container.call(["sh", "-c", before_build_prepared], env=env) log.step("Building wheel...") temp_dir = PurePosixPath("/tmp/cibuildwheel") built_wheel_dir = temp_dir / "built_wheel" - docker.call(["rm", "-rf", built_wheel_dir]) - docker.call(["mkdir", "-p", built_wheel_dir]) + container.call(["rm", "-rf", built_wheel_dir]) + container.call(["mkdir", "-p", built_wheel_dir]) verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity) if build_options.build_frontend == "pip": - docker.call( + container.call( [ "python", "-m", @@ -223,7 +223,7 @@ def build_on_docker( ) elif build_options.build_frontend == "build": config_setting = " ".join(verbosity_flags) - docker.call( + container.call( [ "python", "-m", @@ -238,11 +238,11 @@ def build_on_docker( else: assert_never(build_options.build_frontend) - built_wheel = docker.glob(built_wheel_dir, "*.whl")[0] + built_wheel = container.glob(built_wheel_dir, "*.whl")[0] repaired_wheel_dir = temp_dir / "repaired_wheel" - docker.call(["rm", "-rf", repaired_wheel_dir]) - docker.call(["mkdir", "-p", repaired_wheel_dir]) + container.call(["rm", "-rf", repaired_wheel_dir]) + container.call(["mkdir", "-p", repaired_wheel_dir]) if built_wheel.name.endswith("none-any.whl"): raise NonPlatformWheelError() @@ -252,21 +252,23 @@ def build_on_docker( repair_command_prepared = prepare_command( build_options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir ) - docker.call(["sh", "-c", repair_command_prepared], env=env) + container.call(["sh", "-c", repair_command_prepared], env=env) else: - docker.call(["mv", built_wheel, repaired_wheel_dir]) + container.call(["mv", built_wheel, repaired_wheel_dir]) - repaired_wheels = docker.glob(repaired_wheel_dir, "*.whl") + repaired_wheels = container.glob(repaired_wheel_dir, "*.whl") if build_options.test_command and build_options.test_selector(config.identifier): log.step("Testing wheel...") # set up a virtual environment to install and test from, to make sure # there are no dependencies that were pulled in at build time. - docker.call(["pip", "install", "virtualenv", *dependency_constraint_flags], env=env) - venv_dir = PurePath(docker.call(["mktemp", "-d"], capture_output=True).strip()) / "venv" + container.call(["pip", "install", "virtualenv", *dependency_constraint_flags], env=env) + venv_dir = ( + PurePath(container.call(["mktemp", "-d"], capture_output=True).strip()) / "venv" + ) - docker.call(["python", "-m", "virtualenv", "--no-download", venv_dir], env=env) + container.call(["python", "-m", "virtualenv", "--no-download", venv_dir], env=env) virtualenv_env = env.copy() virtualenv_env["PATH"] = f"{venv_dir / 'bin'}:{virtualenv_env['PATH']}" @@ -277,7 +279,7 @@ def build_on_docker( project=container_project_path, package=container_package_dir, ) - docker.call(["sh", "-c", before_test_prepared], env=virtualenv_env) + container.call(["sh", "-c", before_test_prepared], env=virtualenv_env) # Install the wheel we just built # Note: If auditwheel produced two wheels, it's because the earlier produced wheel @@ -286,14 +288,14 @@ def build_on_docker( # different external shared libraries. so it doesn't matter which one we run the tests on. # Let's just pick the first one. wheel_to_test = repaired_wheels[0] - docker.call( + container.call( ["pip", "install", str(wheel_to_test) + build_options.test_extras], env=virtualenv_env, ) # Install any requirements to run the tests if build_options.test_requires: - docker.call(["pip", "install", *build_options.test_requires], env=virtualenv_env) + container.call(["pip", "install", *build_options.test_requires], env=virtualenv_env) # Run the tests from a different directory test_command_prepared = prepare_command( @@ -301,15 +303,15 @@ def build_on_docker( project=container_project_path, package=container_package_dir, ) - docker.call(["sh", "-c", test_command_prepared], cwd="/root", env=virtualenv_env) + container.call(["sh", "-c", test_command_prepared], cwd="/root", env=virtualenv_env) # clean up test environment - docker.call(["rm", "-rf", venv_dir]) + container.call(["rm", "-rf", venv_dir]) # move repaired wheels to output if abi3_wheel is None: - docker.call(["mkdir", "-p", container_output_dir]) - docker.call(["mv", *repaired_wheels, container_output_dir]) + container.call(["mkdir", "-p", container_output_dir]) + container.call(["mv", *repaired_wheels, container_output_dir]) built_wheels.extend( container_output_dir / repaired_wheel.name for repaired_wheel in repaired_wheels ) @@ -318,7 +320,7 @@ def build_on_docker( log.step("Copying wheels back to host...") # copy the output back into the host - docker.copy_out(container_output_dir, options.globals.output_dir) + container.copy_out(container_output_dir, options.globals.output_dir) log.step_end() @@ -358,21 +360,21 @@ def build(options: Options, tmp_path: Path) -> None: # pylint: disable=unused-a for build_step in get_build_steps(options, python_configurations): try: ids_to_build = [x.identifier for x in build_step.platform_configs] - log.step( - f"Starting Docker image {build_step.container_image} for {', '.join(ids_to_build)}..." - ) + log.step(f"Starting container image {build_step.container_image}...") + + print(f"info: This container will host the build for {', '.join(ids_to_build)}...") with OCIContainer( image=build_step.container_image, simulate_32_bit=build_step.platform_tag.endswith("i686"), cwd=container_project_path, engine=options.globals.container_engine, - ) as docker: + ) as container: - build_on_docker( + build_in_container( options=options, platform_configs=build_step.platform_configs, - docker=docker, + container=container, container_project_path=container_project_path, container_package_dir=container_package_dir, ) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/oci_container.py similarity index 95% rename from cibuildwheel/docker_container.py rename to cibuildwheel/oci_container.py index b910c497..2d79720f 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/oci_container.py @@ -56,7 +56,7 @@ class OCIContainer: engine: ContainerEngine = "docker", ): if not image: - raise ValueError("Must have a non-empty docker image to run.") + raise ValueError("Must have a non-empty image to run.") self.image = image self.simulate_32_bit = simulate_32_bit @@ -175,17 +175,19 @@ class OCIContainer: f"cat > {shell_quote(to_path)}", ], stdin=subprocess.PIPE, - ) as docker: - docker.stdin = cast(IO[bytes], docker.stdin) + ) as exec_process: + exec_process.stdin = cast(IO[bytes], exec_process.stdin) with open(from_path, "rb") as from_file: - shutil.copyfileobj(from_file, docker.stdin) + shutil.copyfileobj(from_file, exec_process.stdin) - docker.stdin.close() - docker.wait() + exec_process.stdin.close() + exec_process.wait() - if docker.returncode: - raise subprocess.CalledProcessError(docker.returncode, docker.args, None, None) + if exec_process.returncode: + raise subprocess.CalledProcessError( + exec_process.returncode, exec_process.args, None, None + ) def copy_out(self, from_path: PurePath, to_path: Path) -> None: # note: we assume from_path is a dir diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index df4114e2..8a5e75c3 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -27,8 +27,8 @@ else: from packaging.specifiers import SpecifierSet from .architecture import Architecture -from .docker_container import ContainerEngine from .environment import EnvironmentParseError, ParsedEnvironment, parse_environment +from .oci_container import ContainerEngine from .projectfiles import get_requires_python_str from .typing import PLATFORMS, Literal, PlatformName, TypedDict from .util import ( diff --git a/docs/diagram.md b/docs/diagram.md index d0557b4f..fe542997 100644 --- a/docs/diagram.md +++ b/docs/diagram.md @@ -8,7 +8,7 @@
- Manylinux Docker container + Manylinux container
@@ -76,7 +76,7 @@ steps: [ [ { - label: 'copy project into docker', + label: 'copy project into container', platforms: ['linux'], style: 'block', width: 2, @@ -204,7 +204,7 @@ ], [ { - label: 'Copy wheels out of Docker', + label: 'Copy wheels out of container', platforms: ['linux'], style: 'block', width: 2, diff --git a/docs/faq.md b/docs/faq.md index 66c05618..fbbf4c67 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -4,15 +4,15 @@ title: Tips and tricks ## Tips -### Linux builds on Docker +### Linux builds in containers -Linux wheels are built in the [`manylinux`/`musllinux` docker images](https://github.com/pypa/manylinux) to provide binary compatible wheels on Linux, according to [PEP 600](https://www.python.org/dev/peps/pep-0600/) / [PEP 656](https://www.python.org/dev/peps/pep-0656/). Because of this, when building with `cibuildwheel` on Linux, a few things should be taken into account: +Linux wheels are built in [`manylinux`/`musllinux` containers](https://github.com/pypa/manylinux) to provide binary compatible wheels on Linux, according to [PEP 600](https://www.python.org/dev/peps/pep-0600/) / [PEP 656](https://www.python.org/dev/peps/pep-0656/). Because of this, when building with `cibuildwheel` on Linux, a few things should be taken into account: -- Programs and libraries are not installed on the CI runner host, but rather should be installed inside of the Docker image - using `yum` for `manylinux2010` or `manylinux2014`, `apt-get` for `manylinux_2_24` and `apk` for `musllinux_1_1`, or manually. The same goes for environment variables that are potentially needed to customize the wheel building. +- Programs and libraries are not installed on the CI runner host, but rather should be installed inside the container - using `yum` for `manylinux2010` or `manylinux2014`, `apt-get` for `manylinux_2_24` and `apk` for `musllinux_1_1`, or manually. The same goes for environment variables that are potentially needed to customize the wheel building. - `cibuildwheel` supports this by providing the [`CIBW_ENVIRONMENT`](options.md#environment) and [`CIBW_BEFORE_ALL`](options.md#before-all) options to setup the build environment inside the running Docker image. + `cibuildwheel` supports this by providing the [`CIBW_ENVIRONMENT`](options.md#environment) and [`CIBW_BEFORE_ALL`](options.md#before-all) options to setup the build environment inside the running container. -- The project directory is mounted in the running Docker instance as `/project`, the output directory for the wheels as `/output`. In general, this is handled transparently by `cibuildwheel`. For a more finegrained level of control however, the root of the host file system is mounted as `/host`, allowing for example to access shared files, caches, etc. on the host file system. Note that `/host` is not available on CircleCI due to their Docker policies. +- The project directory is mounted inside the container as `/project`, the output directory for the wheels as `/output`. In general, this is handled transparently by `cibuildwheel`. For a more finegrained level of control however, the root of the host file system is mounted as `/host`, allowing for example to access shared files, caches, etc. on the host file system. Note that `/host` is not available on CircleCI due to their Docker policies. - Alternative Docker images can be specified with the `CIBW_MANYLINUX_*_IMAGE`/`CIBW_MUSLLINUX_*_IMAGE` options to allow for a custom, preconfigured build environment for the Linux builds. See [options](options.md#linux-image) for more details. diff --git a/docs/options.md b/docs/options.md index f72b388a..fbd03796 100644 --- a/docs/options.md +++ b/docs/options.md @@ -117,9 +117,9 @@ matches overriding earlier ones if multiple selectors match. Environment variables always override static configuration. A few of the options below have special handling in overrides. A different -`before-all` will trigger a new docker launch on Linux, and cannot be +`before-all` will trigger a new container to launch on Linux, and cannot be overridden on macOS or Windows. Overriding the image on linux will also -generate new docker launches, one per image. Some commands are not supported; +trigger new containers, one per image. Some commands are not supported; `output-dir`, build/skip/test_skip selectors, and architectures cannot be overridden. @@ -174,7 +174,7 @@ Default: `auto` `auto` will auto-detect platform using environment variables, such as `TRAVIS_OS_NAME`/`APPVEYOR`/`CIRCLECI`. -- For `linux`, you need Docker running, on Linux, macOS, or Windows. +- For `linux`, you need [Docker or Podman](#container-engine) running, on Linux, macOS, or Windows. - For `macos` and `windows`, you need to be running on the respective system, with a working compiler toolchain installed - Xcode Command Line tools for macOS, and MSVC for Windows. This option can also be set using the [command-line option](#command-line) `--platform`. This option is not available in the `pyproject.toml` config. @@ -523,7 +523,7 @@ Choose which build backend to use. Can either be "pip", which will run A list of environment variables to set during the build. Bash syntax should be used, even on Windows. -You must set this variable to pass variables to Linux builds (since they execute in a Docker container). It also works for the other platforms. +You must set this variable to pass variables to Linux builds (since they execute in a container). It also works for the other platforms. You can use `$PATH` syntax to insert other variables, or the `$(pwd)` syntax to insert the output of other shell commands. @@ -637,14 +637,14 @@ To specify more than one environment variable, separate the variable names by sp Shell command to prepare a common part of the project (e.g. build or install libraries which does not depend on the specific version of Python). -This option is very useful for the Linux build, where builds take place in isolated Docker containers managed by cibuildwheel. This command will run inside the container before the wheel builds start. Note, if you're building both `x86_64` and `i686` wheels (the default), your build uses two different Docker images. In that case, this command will execute twice - once per build container. +This option is very useful for the Linux build, where builds take place in isolated containers managed by cibuildwheel. This command will run inside the container before the wheel builds start. Note, if you're building both `x86_64` and `i686` wheels (the default), your build uses two different container images. In that case, this command will execute twice - once per build container. The placeholder `{package}` can be used here; it will be replaced by the path to the package being built by cibuildwheel. On Windows and macOS, the version of Python available inside `CIBW_BEFORE_ALL` is whatever is available on the host machine. On Linux, a modern Python version is available on PATH. This option has special behavior in the overrides section in `pyproject.toml`. -On linux, overriding it triggers a new docker launch. It cannot be overridden +On linux, overriding it triggers a new container launch. It cannot be overridden on macOS and Windows. Platform-specific environment variables also available:
@@ -866,7 +866,7 @@ Platform-specific environment variables are also available:
### `CIBW_MANYLINUX_*_IMAGE`, `CIBW_MUSLLINUX_*_IMAGE` {: #linux-image} -> Specify alternative manylinux / musllinux Docker images +> Specify alternative manylinux / musllinux container images The available options are (default value): @@ -893,9 +893,9 @@ For `CIBW_MUSLLINUX_*_IMAGE`, the value of this option can either be set to `mus If this option is blank, it will fall though to the next available definition (environment variable -> pyproject.toml -> default). -If setting a custom Docker image, you'll need to make sure it can be used in the same way as the official, default Docker images: all necessary Python and pip versions need to be present in `/opt/python/`, and the auditwheel tool needs to be present for cibuildwheel to work. Apart from that, the architecture and relevant shared system libraries need to be compatible to the relevant standard to produce valid manylinux1/manylinux2010/manylinux2014/manylinux_2_24/manylinux_2_28/musllinux_1_1 wheels (see [pypa/manylinux on GitHub](https://github.com/pypa/manylinux), [PEP 513](https://www.python.org/dev/peps/pep-0513/), [PEP 571](https://www.python.org/dev/peps/pep-0571/), [PEP 599](https://www.python.org/dev/peps/pep-0599/), [PEP 600](https://www.python.org/dev/peps/pep-0600/) and [PEP 656](https://www.python.org/dev/peps/pep-0656/) for more details). +If setting a custom image, you'll need to make sure it can be used in the same way as the default images: all necessary Python and pip versions need to be present in `/opt/python/`, and the auditwheel tool needs to be present for cibuildwheel to work. Apart from that, the architecture and relevant shared system libraries need to be compatible to the relevant standard to produce valid manylinux1/manylinux2010/manylinux2014/manylinux_2_24/manylinux_2_28/musllinux_1_1 wheels (see [pypa/manylinux on GitHub](https://github.com/pypa/manylinux), [PEP 513](https://www.python.org/dev/peps/pep-0513/), [PEP 571](https://www.python.org/dev/peps/pep-0571/), [PEP 599](https://www.python.org/dev/peps/pep-0599/), [PEP 600](https://www.python.org/dev/peps/pep-0600/) and [PEP 656](https://www.python.org/dev/peps/pep-0656/) for more details). -Auditwheel detects the version of the manylinux / musllinux standard in the Docker image through the `AUDITWHEEL_PLAT` environment variable, as cibuildwheel has no way of detecting the correct `--plat` command line argument to pass to auditwheel for a custom image. If a Docker image does not correctly set this `AUDITWHEEL_PLAT` environment variable, the `CIBW_ENVIRONMENT` option can be used to do so (e.g., `CIBW_ENVIRONMENT='AUDITWHEEL_PLAT="manylinux2010_$(uname -m)"'`). +Auditwheel detects the version of the manylinux / musllinux standard in the image through the `AUDITWHEEL_PLAT` environment variable, as cibuildwheel has no way of detecting the correct `--plat` command line argument to pass to auditwheel for a custom image. If a custom image does not correctly set this `AUDITWHEEL_PLAT` environment variable, the `CIBW_ENVIRONMENT` option can be used to do so (e.g., `CIBW_ENVIRONMENT='AUDITWHEEL_PLAT="manylinux2010_$(uname -m)"'`). #### Examples diff --git a/test/test_docker_images.py b/test/test_container_images.py similarity index 100% rename from test/test_docker_images.py rename to test/test_container_images.py diff --git a/test/test_manylinuxXXXX_only.py b/test/test_manylinuxXXXX_only.py index 2a80cbb3..935aa592 100644 --- a/test/test_manylinuxXXXX_only.py +++ b/test/test_manylinuxXXXX_only.py @@ -53,7 +53,7 @@ project_with_manylinux_symbols = test_projects.new_c_project( ) def test(manylinux_image, tmp_path): if utils.platform != "linux": - pytest.skip("the docker test is only relevant to the linux build") + pytest.skip("the container image test is only relevant to the linux build") elif platform.machine() not in ["x86_64", "i686"]: if manylinux_image in ["manylinux1", "manylinux2010"]: pytest.skip("manylinux1 and 2010 doesn't exist for non-x86 architectures") diff --git a/unit_test/linux_build_steps_test.py b/unit_test/linux_build_steps_test.py index fd8f1788..36aaebb7 100644 --- a/unit_test/linux_build_steps_test.py +++ b/unit_test/linux_build_steps_test.py @@ -2,8 +2,8 @@ import textwrap from pathlib import Path from pprint import pprint -import cibuildwheel.docker_container import cibuildwheel.linux +import cibuildwheel.oci_container from cibuildwheel.options import Options from .utils import get_default_command_line_arguments @@ -11,7 +11,7 @@ from .utils import get_default_command_line_arguments def test_linux_container_split(tmp_path: Path, monkeypatch): """ - Tests splitting linux builds by docker image and before_all + Tests splitting linux builds by container image and before_all """ args = get_default_command_line_arguments() diff --git a/unit_test/docker_container_test.py b/unit_test/oci_container_test.py similarity index 99% rename from unit_test/docker_container_test.py rename to unit_test/oci_container_test.py index e4252b03..ca629119 100644 --- a/unit_test/docker_container_test.py +++ b/unit_test/oci_container_test.py @@ -9,8 +9,8 @@ from pathlib import Path, PurePath, PurePosixPath import pytest import toml -from cibuildwheel.docker_container import OCIContainer from cibuildwheel.environment import EnvironmentAssignmentBash +from cibuildwheel.oci_container import OCIContainer # Test utilities diff --git a/unit_test/option_prepare_test.py b/unit_test/option_prepare_test.py index 903746d4..10bca432 100644 --- a/unit_test/option_prepare_test.py +++ b/unit_test/option_prepare_test.py @@ -15,7 +15,7 @@ ALL_IDS = {"cp36", "cp37", "cp38", "cp39", "cp310", "pp37", "pp38", "pp39"} @pytest.fixture -def mock_build_docker(monkeypatch): +def mock_build_container(monkeypatch): def fail_on_call(*args, **kwargs): raise RuntimeError("This should never be called") @@ -37,56 +37,58 @@ def mock_build_docker(monkeypatch): monkeypatch.setattr(util, "download", fail_on_call) monkeypatch.setattr("cibuildwheel.linux.OCIContainer", ignore_context_call) - monkeypatch.setattr("cibuildwheel.linux.build_on_docker", mock.Mock(spec=linux.build_on_docker)) + monkeypatch.setattr( + "cibuildwheel.linux.build_in_container", mock.Mock(spec=linux.build_in_container) + ) monkeypatch.setattr("cibuildwheel.util.print_new_wheels", ignore_context_call) -def test_build_default_launches(mock_build_docker, fake_package_dir, monkeypatch): +def test_build_default_launches(mock_build_container, fake_package_dir, monkeypatch): monkeypatch.setattr(sys, "argv", ["cibuildwheel", "--platform=linux"]) main() - build_on_docker = cast(mock.Mock, linux.build_on_docker) + build_in_container = cast(mock.Mock, linux.build_in_container) - assert build_on_docker.call_count == 4 + assert build_in_container.call_count == 4 # In Python 3.8+, this can be simplified to [0].kwargs - kwargs = build_on_docker.call_args_list[0][1] - assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["image"] - assert kwargs["docker"]["cwd"] == PurePosixPath("/project") - assert not kwargs["docker"]["simulate_32_bit"] + kwargs = build_in_container.call_args_list[0][1] + assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["container"]["image"] + assert kwargs["container"]["cwd"] == PurePosixPath("/project") + assert not kwargs["container"]["simulate_32_bit"] identifiers = {x.identifier for x in kwargs["platform_configs"]} assert identifiers == {f"{x}-manylinux_x86_64" for x in ALL_IDS} - kwargs = build_on_docker.call_args_list[1][1] - assert "quay.io/pypa/manylinux2014_i686" in kwargs["docker"]["image"] - assert kwargs["docker"]["cwd"] == PurePosixPath("/project") - assert kwargs["docker"]["simulate_32_bit"] + kwargs = build_in_container.call_args_list[1][1] + assert "quay.io/pypa/manylinux2014_i686" in kwargs["container"]["image"] + assert kwargs["container"]["cwd"] == PurePosixPath("/project") + assert kwargs["container"]["simulate_32_bit"] identifiers = {x.identifier for x in kwargs["platform_configs"]} assert identifiers == {f"{x}-manylinux_i686" for x in ALL_IDS} - kwargs = build_on_docker.call_args_list[2][1] - assert "quay.io/pypa/musllinux_1_1_x86_64" in kwargs["docker"]["image"] - assert kwargs["docker"]["cwd"] == PurePosixPath("/project") - assert not kwargs["docker"]["simulate_32_bit"] + kwargs = build_in_container.call_args_list[2][1] + assert "quay.io/pypa/musllinux_1_1_x86_64" in kwargs["container"]["image"] + assert kwargs["container"]["cwd"] == PurePosixPath("/project") + assert not kwargs["container"]["simulate_32_bit"] identifiers = {x.identifier for x in kwargs["platform_configs"]} assert identifiers == { f"{x}-musllinux_x86_64" for x in ALL_IDS for x in ALL_IDS if "pp" not in x } - kwargs = build_on_docker.call_args_list[3][1] - assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["docker"]["image"] - assert kwargs["docker"]["cwd"] == PurePosixPath("/project") - assert kwargs["docker"]["simulate_32_bit"] + kwargs = build_in_container.call_args_list[3][1] + assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["container"]["image"] + assert kwargs["container"]["cwd"] == PurePosixPath("/project") + assert kwargs["container"]["simulate_32_bit"] identifiers = {x.identifier for x in kwargs["platform_configs"]} assert identifiers == {f"{x}-musllinux_i686" for x in ALL_IDS if "pp" not in x} -def test_build_with_override_launches(mock_build_docker, monkeypatch, tmp_path): +def test_build_with_override_launches(mock_build_container, monkeypatch, tmp_path): pkg_dir = tmp_path / "cibw_package" pkg_dir.mkdir() @@ -113,23 +115,23 @@ before-all = "true" main() - build_on_docker = cast(mock.Mock, linux.build_on_docker) + build_in_container = cast(mock.Mock, linux.build_in_container) - assert build_on_docker.call_count == 6 + assert build_in_container.call_count == 6 - kwargs = build_on_docker.call_args_list[0][1] - assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["image"] - assert kwargs["docker"]["cwd"] == PurePosixPath("/project") - assert not kwargs["docker"]["simulate_32_bit"] + kwargs = build_in_container.call_args_list[0][1] + assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["container"]["image"] + assert kwargs["container"]["cwd"] == PurePosixPath("/project") + assert not kwargs["container"]["simulate_32_bit"] identifiers = {x.identifier for x in kwargs["platform_configs"]} assert identifiers == {"cp36-manylinux_x86_64"} assert kwargs["options"].build_options("cp36-manylinux_x86_64").before_all == "true" - kwargs = build_on_docker.call_args_list[1][1] - assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["image"] - assert kwargs["docker"]["cwd"] == PurePosixPath("/project") - assert not kwargs["docker"]["simulate_32_bit"] + kwargs = build_in_container.call_args_list[1][1] + assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["container"]["image"] + assert kwargs["container"]["cwd"] == PurePosixPath("/project") + assert not kwargs["container"]["simulate_32_bit"] identifiers = {x.identifier for x in kwargs["platform_configs"]} assert identifiers == { @@ -137,10 +139,10 @@ before-all = "true" } assert kwargs["options"].build_options("cp37-manylinux_x86_64").before_all == "" - kwargs = build_on_docker.call_args_list[2][1] - assert "quay.io/pypa/manylinux_2_24_x86_64" in kwargs["docker"]["image"] - assert kwargs["docker"]["cwd"] == PurePosixPath("/project") - assert not kwargs["docker"]["simulate_32_bit"] + kwargs = build_in_container.call_args_list[2][1] + assert "quay.io/pypa/manylinux_2_24_x86_64" in kwargs["container"]["image"] + assert kwargs["container"]["cwd"] == PurePosixPath("/project") + assert not kwargs["container"]["simulate_32_bit"] identifiers = {x.identifier for x in kwargs["platform_configs"]} assert identifiers == { "cp310-manylinux_x86_64", @@ -149,28 +151,28 @@ before-all = "true" "pp39-manylinux_x86_64", } - kwargs = build_on_docker.call_args_list[3][1] - assert "quay.io/pypa/manylinux2014_i686" in kwargs["docker"]["image"] - assert kwargs["docker"]["cwd"] == PurePosixPath("/project") - assert kwargs["docker"]["simulate_32_bit"] + kwargs = build_in_container.call_args_list[3][1] + assert "quay.io/pypa/manylinux2014_i686" in kwargs["container"]["image"] + assert kwargs["container"]["cwd"] == PurePosixPath("/project") + assert kwargs["container"]["simulate_32_bit"] identifiers = {x.identifier for x in kwargs["platform_configs"]} assert identifiers == {f"{x}-manylinux_i686" for x in ALL_IDS} - kwargs = build_on_docker.call_args_list[4][1] - assert "quay.io/pypa/musllinux_1_1_x86_64" in kwargs["docker"]["image"] - assert kwargs["docker"]["cwd"] == PurePosixPath("/project") - assert not kwargs["docker"]["simulate_32_bit"] + kwargs = build_in_container.call_args_list[4][1] + assert "quay.io/pypa/musllinux_1_1_x86_64" in kwargs["container"]["image"] + assert kwargs["container"]["cwd"] == PurePosixPath("/project") + assert not kwargs["container"]["simulate_32_bit"] identifiers = {x.identifier for x in kwargs["platform_configs"]} assert identifiers == { f"{x}-musllinux_x86_64" for x in ALL_IDS for x in ALL_IDS if "pp" not in x } - kwargs = build_on_docker.call_args_list[5][1] - assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["docker"]["image"] - assert kwargs["docker"]["cwd"] == PurePosixPath("/project") - assert kwargs["docker"]["simulate_32_bit"] + kwargs = build_in_container.call_args_list[5][1] + assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["container"]["image"] + assert kwargs["container"]["cwd"] == PurePosixPath("/project") + assert kwargs["container"]["simulate_32_bit"] identifiers = {x.identifier for x in kwargs["platform_configs"]} assert identifiers == {f"{x}-musllinux_i686" for x in ALL_IDS if "pp" not in x} From e5ef3c1b7616446bbdeb8da2b0bbb203ccb582dd Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 18:35:28 +0100 Subject: [PATCH 24/41] Tweak test config to remove always-skipped test --- unit_test/oci_container_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unit_test/oci_container_test.py b/unit_test/oci_container_test.py index ca629119..baee3c3d 100644 --- a/unit_test/oci_container_test.py +++ b/unit_test/oci_container_test.py @@ -217,10 +217,10 @@ def test_environment_executor(container_engine): assert assignment.evaluated_value({}, container.environment_executor) == "42" -def test_podman_vfs(container_engine, tmp_path: Path, monkeypatch): +def test_podman_vfs(tmp_path: Path, monkeypatch, request): # Tests podman VFS, for the podman in docker use-case - if container_engine != "podman": - pytest.skip("podman is the only supported container engine for this test") + if not request.config.getoption("--run-podman"): + pytest.skip("need --run-podman option to run") # create the VFS configuration vfs_path = tmp_path / "podman_vfs" @@ -278,7 +278,7 @@ def test_podman_vfs(container_engine, tmp_path: Path, monkeypatch): monkeypatch.setenv("CONTAINERS_CONF", str(vfs_containers_conf_fpath)) monkeypatch.setenv("CONTAINERS_STORAGE_CONF", str(vfs_containers_storage_conf_fpath)) - with OCIContainer(engine=container_engine, image=DEFAULT_IMAGE) as container: + with OCIContainer(engine="podman", image=DEFAULT_IMAGE) as container: # test running a command assert container.call(["echo", "hello"], capture_output=True) == "hello\n" From f23d8aaae56a36dbb1b73e89757003804001794f Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 19:08:46 +0100 Subject: [PATCH 25/41] Add an integration test for a podman build --- .github/workflows/test.yml | 2 +- bin/run_tests.py | 44 +++++++++++++++++++++++--------------- test/conftest.py | 15 +------------ test/test_emulation.py | 6 ++++-- test/test_podman.py | 37 ++++++++++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 34 deletions(-) create mode 100644 test/test_podman.py diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 63f3f5d4..8b565e36 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -75,7 +75,7 @@ jobs: - name: Test cibuildwheel run: | - python ./bin/run_tests.py + python ./bin/run_tests.py --run-podman test-emulated: name: Test emulated cibuildwheel using qemu diff --git a/bin/run_tests.py b/bin/run_tests.py index 44c6d302..5f3a3606 100755 --- a/bin/run_tests.py +++ b/bin/run_tests.py @@ -1,33 +1,43 @@ #!/usr/bin/env python3 +import argparse import os import subprocess import sys from pathlib import Path if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("--run-podman", action="store_true", default=False, help="run podman tests") + args = parser.parse_args() + # move cwd to the project root os.chdir(Path(__file__).resolve().parents[1]) - # run the unit tests + # unit tests unit_test_args = [sys.executable, "-m", "pytest", "unit_test"] - # run the docker unit tests only on Linux + if sys.platform.startswith("linux"): + # run the docker unit tests only on Linux unit_test_args += ["--run-docker"] + if args.run_podman: + unit_test_args += ["--run-podman"] + subprocess.run(unit_test_args, check=True) - # run the integration tests - subprocess.run( - [ - sys.executable, - "-m", - "pytest", - "--numprocesses=2", - "-x", - "--durations", - "0", - "--timeout=2400", - "test", - ], - check=True, - ) + # integration tests + integration_test_args = [ + sys.executable, + "-m", + "pytest", + "--numprocesses=2", + "-x", + "--durations", + "0", + "--timeout=2400", + "test", + ] + if args.run_podman: + integration_test_args += ["--run-podman"] + + subprocess.run(integration_test_args, check=True) diff --git a/test/conftest.py b/test/conftest.py index d8ff2f62..e7c42112 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -7,20 +7,7 @@ def pytest_addoption(parser) -> None: parser.addoption( "--run-emulation", action="store_true", default=False, help="run emulation tests" ) - - -def pytest_configure(config): - config.addinivalue_line("markers", "emulation: mark test requiring qemu binfmt_misc to run") - - -def pytest_collection_modifyitems(config, items) -> None: - if config.getoption("--run-emulation"): - # --run-emulation given in cli: do not skip emulation tests - return - skip_emulation = pytest.mark.skip(reason="need --run-emulation option to run") - for item in items: - if "emulation" in item.keywords: - item.add_marker(skip_emulation) + parser.addoption("--run-podman", action="store_true", default=False, help="run podman tests") @pytest.fixture( diff --git a/test/test_emulation.py b/test/test_emulation.py index dd76ab36..95b574dd 100644 --- a/test/test_emulation.py +++ b/test/test_emulation.py @@ -17,8 +17,10 @@ def test_spam(): """ -@pytest.mark.emulation -def test(tmp_path): +def test(tmp_path, request): + if not request.config.getoption("--run-emulation"): + pytest.skip("needs --run-emulation option to run") + project_dir = tmp_path / "project" project_with_a_test.generate(project_dir) diff --git a/test/test_podman.py b/test/test_podman.py new file mode 100644 index 00000000..d4bdf556 --- /dev/null +++ b/test/test_podman.py @@ -0,0 +1,37 @@ +import pytest + +from . import test_projects, utils + +basic_project = test_projects.new_c_project() + + +def test(tmp_path, capfd, request): + if utils.platform != "linux": + pytest.skip("the test is only relevant to the linux build") + + if not request.config.getoption("--run-podman"): + pytest.skip("needs --run-podman option to run") + + project_dir = tmp_path / "project" + basic_project.generate(project_dir) + + # build some musllinux and manylinux wheels (ensuring that we use two containers) + actual_wheels = utils.cibuildwheel_run( + project_dir, + add_env={ + "CIBW_BUILD": "cp310-*{manylinux,musllinux}_x86_64", + "CIBW_BEFORE_ALL": "echo 'test log statement from before-all'", + }, + ) + + # check that the expected wheels are produced + expected_wheels = [ + w + for w in utils.expected_wheels("spam", "0.1.0") + if ("-cp310-" in w) and ("x86_64" in w) and ("manylinux" in w or "musllinux" in w) + ] + assert set(actual_wheels) == set(expected_wheels) + + # check that stdout is bring passed-though from container correctly + captured = capfd.readouterr() + assert "test log statement from before-all" in captured.out From b612a6c9936161840bbf316dde6f51fb50781ece Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 19:19:00 +0100 Subject: [PATCH 26/41] Actually run the podman integration test on podman :) --- test/test_podman.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_podman.py b/test/test_podman.py index d4bdf556..dd07572b 100644 --- a/test/test_podman.py +++ b/test/test_podman.py @@ -21,6 +21,7 @@ def test(tmp_path, capfd, request): add_env={ "CIBW_BUILD": "cp310-*{manylinux,musllinux}_x86_64", "CIBW_BEFORE_ALL": "echo 'test log statement from before-all'", + "CIBW_CONTAINER_ENGINE": "podman", }, ) From 22ba00bb4619787fe2892dd89286a5052f44f821 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 27 Jun 2022 19:32:35 +0100 Subject: [PATCH 27/41] Fix missing rename --- cibuildwheel/oci_container.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cibuildwheel/oci_container.py b/cibuildwheel/oci_container.py index 2d79720f..3550a88c 100644 --- a/cibuildwheel/oci_container.py +++ b/cibuildwheel/oci_container.py @@ -30,7 +30,7 @@ class OCIContainer: back to cibuildwheel. Example: - >>> from cibuildwheel.docker_container import * # NOQA + >>> from cibuildwheel.oci_container import * # NOQA >>> from cibuildwheel.options import _get_pinned_container_images >>> image = _get_pinned_container_images()['x86_64']['manylinux2014'] >>> # Test the default container From 12a3fa2d3e6e232b3114679730436df7d7add175 Mon Sep 17 00:00:00 2001 From: joncrall Date: Mon, 27 Jun 2022 16:23:02 -0400 Subject: [PATCH 28/41] Use tomli_w instead of toml --- setup.py | 2 +- unit_test/oci_container_test.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index ad32d3f3..2ceaa359 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ extras = { "pytest-timeout", "pytest-xdist", "build", - "toml", + "toml_w", ], "bin": [ "click", diff --git a/unit_test/oci_container_test.py b/unit_test/oci_container_test.py index baee3c3d..838c72bd 100644 --- a/unit_test/oci_container_test.py +++ b/unit_test/oci_container_test.py @@ -7,7 +7,8 @@ import textwrap from pathlib import Path, PurePath, PurePosixPath import pytest -import toml + +import tomli_w from cibuildwheel.environment import EnvironmentAssignmentBash from cibuildwheel.oci_container import OCIContainer @@ -269,11 +270,11 @@ def test_podman_vfs(tmp_path: Path, monkeypatch, request): vfs_containers_conf_fpath = vfs_path / "temp_vfs_containers.conf" vfs_containers_storage_conf_fpath = vfs_path / "temp_vfs_containers_storage.conf" - with open(vfs_containers_conf_fpath, "w") as file: - toml.dump(vfs_containers_conf_data, file) + with open(vfs_containers_conf_fpath, "wb") as file: + tomli_w.dump(vfs_containers_conf_data, file) - with open(vfs_containers_storage_conf_fpath, "w") as file: - toml.dump(vfs_containers_storage_conf_data, file) + with open(vfs_containers_storage_conf_fpath, "wb") as file: + tomli_w.dump(vfs_containers_storage_conf_data, file) monkeypatch.setenv("CONTAINERS_CONF", str(vfs_containers_conf_fpath)) monkeypatch.setenv("CONTAINERS_STORAGE_CONF", str(vfs_containers_storage_conf_fpath)) From 46678e24e312ff75bd479bab53160172d0ebf6b9 Mon Sep 17 00:00:00 2001 From: joncrall Date: Mon, 27 Jun 2022 16:24:00 -0400 Subject: [PATCH 29/41] Inlined podman install --- .github/install_latest_podman.sh | 12 ------------ .github/workflows/test.yml | 7 ++++++- 2 files changed, 6 insertions(+), 13 deletions(-) delete mode 100755 .github/install_latest_podman.sh diff --git a/.github/install_latest_podman.sh b/.github/install_latest_podman.sh deleted file mode 100755 index 42eca8b9..00000000 --- a/.github/install_latest_podman.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -__doc__=" -Based on code in: https://github.com/redhat-actions/podman-login/blob/main/.github/install_latest_podman.sh -" -# https://podman.io/getting-started/installation -# shellcheck source=/dev/null -. /etc/os-release -echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list -curl -sSfL "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key" | sudo apt-key add - -sudo apt-get update -sudo apt-get -y upgrade -sudo apt-get -y install podman diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8b565e36..20217b16 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,12 @@ jobs: - name: Install latest podman if: runner.os == 'Linux' run: | - bash .github/install_latest_podman.sh + . /etc/os-release + echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list + curl -sSfL "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key" | sudo apt-key add - + sudo apt-get update + sudo apt-get -y upgrade + sudo apt-get -y install podman - name: Install dependencies run: | From 062ab6cb93e035cff13f7abc842effa11be16181 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 20:24:14 +0000 Subject: [PATCH 30/41] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- unit_test/oci_container_test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/unit_test/oci_container_test.py b/unit_test/oci_container_test.py index 838c72bd..2f425daf 100644 --- a/unit_test/oci_container_test.py +++ b/unit_test/oci_container_test.py @@ -7,7 +7,6 @@ import textwrap from pathlib import Path, PurePath, PurePosixPath import pytest - import tomli_w from cibuildwheel.environment import EnvironmentAssignmentBash From f182ed3cfaa13a2b90d1f9a21cfb59df8f2098be Mon Sep 17 00:00:00 2001 From: joncrall Date: Mon, 27 Jun 2022 23:40:41 -0400 Subject: [PATCH 31/41] Fix spelling --- .pre-commit-config.yaml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e54c6d3b..e93e3dc8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -61,13 +61,13 @@ repos: - pygithub - rich - tomli + - tomli_w - types-certifi - types-click - types-dataclasses - types-jinja2 - types-pyyaml - types-requests - - types-toml - bracex - dataclasses - id: mypy diff --git a/setup.py b/setup.py index 2ceaa359..cd4956e1 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ extras = { "pytest-timeout", "pytest-xdist", "build", - "toml_w", + "tomli_w", ], "bin": [ "click", From f69fa19d071e7429e1036fbbe26c1b9741a88a78 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 29 Jun 2022 20:18:08 +0100 Subject: [PATCH 32/41] Run podman tests only on linux --- bin/run_tests.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/run_tests.py b/bin/run_tests.py index 5f3a3606..82e193c3 100755 --- a/bin/run_tests.py +++ b/bin/run_tests.py @@ -8,7 +8,9 @@ from pathlib import Path if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument("--run-podman", action="store_true", default=False, help="run podman tests") + parser.add_argument( + "--run-podman", action="store_true", default=False, help="run podman tests (linux only)" + ) args = parser.parse_args() # move cwd to the project root @@ -20,8 +22,9 @@ if __name__ == "__main__": if sys.platform.startswith("linux"): # run the docker unit tests only on Linux unit_test_args += ["--run-docker"] - if args.run_podman: - unit_test_args += ["--run-podman"] + + if args.run_podman: + unit_test_args += ["--run-podman"] subprocess.run(unit_test_args, check=True) @@ -37,7 +40,8 @@ if __name__ == "__main__": "--timeout=2400", "test", ] - if args.run_podman: + + if sys.platform.startswith("linux") and args.run_podman: integration_test_args += ["--run-podman"] subprocess.run(integration_test_args, check=True) From c4bb04567baaba1c8b5ffd24cb08fc4442c968af Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 29 Jun 2022 21:06:24 +0100 Subject: [PATCH 33/41] Add docs for CIBW_CONTAINER_ENGINE --- README.md | 1 + docs/options.md | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/README.md b/README.md index 74f2adf4..fb40fc7f 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,7 @@ Options | | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-build) | Execute a shell command preparing each wheel's build | | | [`CIBW_REPAIR_WHEEL_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command) | Execute a shell command to repair each built wheel | | | [`CIBW_MANYLINUX_*_IMAGE`
`CIBW_MUSLLINUX_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image) | Specify alternative manylinux / musllinux Docker images | +| | [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine) | Specify which container engine to use when building Linux wheels | | | [`CIBW_DEPENDENCY_VERSIONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions) | Specify how cibuildwheel controls the versions of the tools it uses | | **Testing** | [`CIBW_TEST_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-command) | Execute a shell command to test each built wheel | | | [`CIBW_BEFORE_TEST`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-test) | Execute a shell command before testing each wheel | diff --git a/docs/options.md b/docs/options.md index 01ac29b0..6b899654 100644 --- a/docs/options.md +++ b/docs/options.md @@ -964,6 +964,44 @@ Auditwheel detects the version of the manylinux / musllinux standard in the imag Like any other option, these can be placed in `[tool.cibuildwheel.linux]` if you prefer; they have no effect on `macos` and `windows`. + +### `CIBW_CONTAINER_ENGINE` {: #container-engine} +> Specify which container engine to use when building Linux wheels + +Options: `docker` `podman` + +Default: `docker` + +Set the container engine to use. Docker is the default, or you can switch to +[Podman](https://podman.io/). To use Docker, you need to have a Docker daemon +running and `docker` available on PATH. To use Podman, it needs to be +installed and `podman` available on PATH. + +!!! tip + + While most users will stick with Docker, Podman is available in different + contexts - for example, it can be run inside a Docker container, or without + root access. Thanks to the [OCI], images are compatible between engines, so + you can still use the regular manylinux/musllinux containers. + +[OCI]: https://opencontainers.org/ + +#### Examples + +!!! tab examples "Environment variables" + + ```yaml + CIBW_CONTAINER_ENGINE: podman + ``` + +!!! tab examples "pyproject.toml" + + ```toml + [tool.cibuildwheel] + container-engine = "podman" + ``` + + ### `CIBW_DEPENDENCY_VERSIONS` {: #dependency-versions} > Specify how cibuildwheel controls the versions of the tools it uses @@ -1029,6 +1067,7 @@ Platform-specific environment variables are also available:
dependency-versions = "./constraints.txt" ``` + ## Testing ### `CIBW_TEST_COMMAND` {: #test-command} From 075792473a7e6ffa59040b0dc66dc2b4d85b3e77 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 29 Jun 2022 18:10:35 -0400 Subject: [PATCH 34/41] chore: simpler dependabot (#1165) * chore: simpler dependabot Ignores no longer needed after April 2022. Dependabot keeps the same style pinning now. * Update faq.md --- .github/dependabot.yml | 3 --- docs/faq.md | 4 ---- 2 files changed, 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ce05ac5c..6fddca0d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,3 @@ updates: directory: "/" schedule: interval: "weekly" - ignore: - - dependency-name: "actions/*" - update-types: ["version-update:semver-minor", "version-update:semver-patch"] diff --git a/docs/faq.md b/docs/faq.md index 66c05618..b66bd0e4 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -147,10 +147,6 @@ updates: directory: "/" schedule: interval: "weekly" - ignore: - # Optional: Official actions have moving tags like v1; - # if you use those, you don't need updates. - - dependency-name: "actions/*" ``` #### Option 2: Requirement files From a3616700f5246548220fab6afc19b44535520bdb Mon Sep 17 00:00:00 2001 From: joncrall Date: Wed, 29 Jun 2022 21:00:15 -0400 Subject: [PATCH 35/41] Pass cwd to first two calls --- cibuildwheel/oci_container.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cibuildwheel/oci_container.py b/cibuildwheel/oci_container.py index 3550a88c..c02f7678 100644 --- a/cibuildwheel/oci_container.py +++ b/cibuildwheel/oci_container.py @@ -110,13 +110,13 @@ class OCIContainer: self.bash_stdout = self.process.stdout # run a noop command to block until the container is responding - self.call(["/bin/true"]) + self.call(["/bin/true"], cwd="/") if self.cwd: # Although `docker create -w` does create the working dir if it # does not exist, podman does not. There does not seem to be a way # to setup a workdir for a container running in podman. - self.call(["mkdir", "-p", os.fspath(self.cwd)]) + self.call(["mkdir", "-p", os.fspath(self.cwd)], cwd="/") return self From 9a537512c141c050e89f7b6e251f6dfb9b0898a7 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sun, 3 Jul 2022 20:00:00 +0200 Subject: [PATCH 36/41] feat: add support for `py3-none-{platform}` wheels (#1151) * feature: add support for `py3-none-{platform}` wheels This extends the mechanism introduced in #1091 for `abi3` wheels. Most of the mentions to `abi3` have been removed and replaced by a more generic `compatible_wheel`. This allows to build a wheel `foo-0.1-py3-none-win_amd64.whl` only once and still test with every configured python. * Add integration test for py3-none abi wheels * Fix expected_wheels for py3-none abi * Limit test to three pythons and check for certain log messages * chore: add some comments to explain filter process Co-authored-by: Joe Rickerby Co-authored-by: Henry Schreiner --- cibuildwheel/linux.py | 12 +-- cibuildwheel/macos.py | 12 +-- cibuildwheel/util.py | 37 +++++--- cibuildwheel/windows.py | 12 +-- setup.cfg | 4 +- test/test_abi_variants.py | 179 ++++++++++++++++++++++++++++++++++++++ test/test_limited_api.py | 50 ----------- test/utils.py | 34 ++++---- unit_test/utils_test.py | 44 +++++++++- 9 files changed, 284 insertions(+), 100 deletions(-) create mode 100644 test/test_abi_variants.py delete mode 100644 test/test_limited_api.py diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index b278d48b..70f91c10 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -13,7 +13,7 @@ from .typing import OrderedDict, PathOrStr, assert_never from .util import ( BuildSelector, NonPlatformWheelError, - find_compatible_abi3_wheel, + find_compatible_wheel, get_build_verbosity_extra_flags, prepare_command, read_python_configs, @@ -180,13 +180,13 @@ def build_on_docker( ) sys.exit(1) - abi3_wheel = find_compatible_abi3_wheel(built_wheels, config.identifier) - if abi3_wheel: + compatible_wheel = find_compatible_wheel(built_wheels, config.identifier) + if compatible_wheel: log.step_end() print( - f"\nFound previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." + f"\nFound previously built wheel {compatible_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) - repaired_wheels = [abi3_wheel] + repaired_wheels = [compatible_wheel] else: if build_options.before_build: @@ -307,7 +307,7 @@ def build_on_docker( docker.call(["rm", "-rf", venv_dir]) # move repaired wheels to output - if abi3_wheel is None: + if compatible_wheel is None: docker.call(["mkdir", "-p", container_output_dir]) docker.call(["mv", *repaired_wheels, container_output_dir]) built_wheels.extend( diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 2da719ea..22213de8 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -24,7 +24,7 @@ from .util import ( call, detect_ci_provider, download, - find_compatible_abi3_wheel, + find_compatible_wheel, get_build_verbosity_extra_flags, get_pip_version, install_certifi_script, @@ -323,13 +323,13 @@ def build(options: Options, tmp_path: Path) -> None: build_options.build_frontend, ) - abi3_wheel = find_compatible_abi3_wheel(built_wheels, config.identifier) - if abi3_wheel: + compatible_wheel = find_compatible_wheel(built_wheels, config.identifier) + if compatible_wheel: log.step_end() print( - f"\nFound previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." + f"\nFound previously built wheel {compatible_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) - repaired_wheel = abi3_wheel + repaired_wheel = compatible_wheel else: if build_options.before_build: log.step("Running before_build...") @@ -536,7 +536,7 @@ def build(options: Options, tmp_path: Path) -> None: ) # we're all done here; move it to output (overwrite existing) - if abi3_wheel is None: + if compatible_wheel is None: try: (build_options.output_dir / repaired_wheel.name).unlink() except FileNotFoundError: diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index 9bc151cc..d3f42bda 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -53,7 +53,7 @@ __all__ = [ "MANYLINUX_ARCHS", "call", "shell", - "find_compatible_abi3_wheel", + "find_compatible_wheel", "format_safe", "prepare_command", "get_build_verbosity_extra_flags", @@ -575,36 +575,47 @@ def virtualenv( T = TypeVar("T", bound=PurePath) -def find_compatible_abi3_wheel(wheels: Sequence[T], identifier: str) -> Optional[T]: +def find_compatible_wheel(wheels: Sequence[T], identifier: str) -> Optional[T]: """ - Finds an ABI3 wheel in `wheels` compatible with the Python interpreter - specified by `identifier`. + Finds a wheel with an abi3 or a none ABI tag in `wheels` compatible with the Python interpreter + specified by `identifier` that is previously built. """ interpreter, platform = identifier.split("-") - if not interpreter.startswith("cp3"): - return None for wheel in wheels: _, _, _, tags = parse_wheel_filename(wheel.name) for tag in tags: - if tag.abi != "abi3": + if tag.abi == "abi3": + # ABI3 wheels must start with cp3 for impl and tag + if not (interpreter.startswith("cp3") and tag.interpreter.startswith("cp3")): + continue + elif tag.abi == "none": + # CPythonless wheels must include py3 tag + if tag.interpreter[:3] != "py3": + continue + else: + # Other types of wheels are not detected, this is looking for previously built wheels. continue - if not tag.interpreter.startswith("cp3"): - continue - if int(tag.interpreter[3:]) > int(interpreter[3:]): + + if tag.interpreter != "py3" and int(tag.interpreter[3:]) > int(interpreter[3:]): + # If a minor version number is given, it has to be lower than the current one. continue + if platform.startswith(("manylinux", "musllinux", "macosx")): - # Linux, macOS + # Linux, macOS require the beginning and ending match (macos/manylinux version doesn't need to) os_, arch = platform.split("_", 1) if not tag.platform.startswith(os_): continue - if not tag.platform.endswith("_" + arch): + if not tag.platform.endswith(f"_{arch}"): continue else: - # Windows + # Windows should exactly match if not tag.platform == platform: continue + + # If all the filters above pass, then the wheel is a previously built compatible wheel. return wheel + return None diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 0ad2e2ae..46b8bf90 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -23,7 +23,7 @@ from .util import ( NonPlatformWheelError, call, download, - find_compatible_abi3_wheel, + find_compatible_wheel, get_build_verbosity_extra_flags, get_pip_version, prepare_command, @@ -279,13 +279,13 @@ def build(options: Options, tmp_path: Path) -> None: build_options.build_frontend, ) - abi3_wheel = find_compatible_abi3_wheel(built_wheels, config.identifier) - if abi3_wheel: + compatible_wheel = find_compatible_wheel(built_wheels, config.identifier) + if compatible_wheel: log.step_end() print( - f"\nFound previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." + f"\nFound previously built wheel {compatible_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) - repaired_wheel = abi3_wheel + repaired_wheel = compatible_wheel else: # run the before_build command if build_options.before_build: @@ -420,7 +420,7 @@ def build(options: Options, tmp_path: Path) -> None: shell(test_command_prepared, cwd="c:\\", env=virtualenv_env) # we're all done here; move it to output (remove if already exists) - if abi3_wheel is None: + if compatible_wheel is None: shutil.move(str(repaired_wheel), build_options.output_dir) built_wheels.append(build_options.output_dir / repaired_wheel.name) diff --git a/setup.cfg b/setup.cfg index 4f91bf92..838631e0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -56,8 +56,8 @@ console_scripts = cibuildwheel = resources/* [flake8] -extend-ignore = E203,E501,B950 -extend-select = B,B9 +extend-ignore = E203,E501,B950,B023 +extend-select = B9 application-import-names = cibuildwheel exclude = cibuildwheel/resources/, diff --git a/test/test_abi_variants.py b/test/test_abi_variants.py new file mode 100644 index 00000000..932a2ec0 --- /dev/null +++ b/test/test_abi_variants.py @@ -0,0 +1,179 @@ +import textwrap + +from . import test_projects, utils + +limited_api_project = test_projects.new_c_project( + setup_py_add=textwrap.dedent( + r""" + cmdclass = {} + extension_kwargs = {} + if sys.version_info[:2] >= (3, 8): + from wheel.bdist_wheel import bdist_wheel as _bdist_wheel + + class bdist_wheel_abi3(_bdist_wheel): + def finalize_options(self): + _bdist_wheel.finalize_options(self) + self.root_is_pure = False + + def get_tag(self): + python, abi, plat = _bdist_wheel.get_tag(self) + return python, "abi3", plat + + cmdclass["bdist_wheel"] = bdist_wheel_abi3 + extension_kwargs["define_macros"] = [("Py_LIMITED_API", "0x03080000")] + extension_kwargs["py_limited_api"] = True + """ + ), + setup_py_extension_args_add="**extension_kwargs", + setup_py_setup_args_add="cmdclass=cmdclass", +) + + +def test_abi3(tmp_path): + project_dir = tmp_path / "project" + limited_api_project.generate(project_dir) + + # build the wheels + actual_wheels = utils.cibuildwheel_run( + project_dir, + add_env={ + "CIBW_SKIP": "pp* ", # PyPy does not have a Py_LIMITED_API equivalent + }, + ) + + # check that the expected wheels are produced + expected_wheels = [ + w.replace("cp38-cp38", "cp38-abi3") + for w in utils.expected_wheels("spam", "0.1.0") + if "-pp" not in w and "-cp39" not in w and "-cp310" not in w and "-cp311" not in w + ] + assert set(actual_wheels) == set(expected_wheels) + + +ctypes_project = test_projects.TestProject() +ctypes_project.files["setup.py"] = textwrap.dedent( + """ + from setuptools import setup, Extension + + from distutils.command.build_ext import build_ext as _build_ext + class CTypesExtension(Extension): pass + class build_ext(_build_ext): + def build_extension(self, ext): + self._ctypes = isinstance(ext, CTypesExtension) + return super().build_extension(ext) + + def get_export_symbols(self, ext): + if self._ctypes: + return ext.export_symbols + return super().get_export_symbols(ext) + + def get_ext_filename(self, ext_name): + if self._ctypes: + return ext_name + '.so' + return super().get_ext_filename(ext_name) + + from wheel.bdist_wheel import bdist_wheel as _bdist_wheel + class bdist_wheel_abi_none(_bdist_wheel): + def finalize_options(self): + _bdist_wheel.finalize_options(self) + self.root_is_pure = False + + def get_tag(self): + python, abi, plat = _bdist_wheel.get_tag(self) + return "py3", "none", plat + + setup( + name="ctypesexample", + version="1.0.0", + py_modules = ["ctypesexample.summing"], + ext_modules=[ + CTypesExtension( + "ctypesexample.csumlib", + ["ctypesexample/csumlib.c"], + ), + ], + cmdclass={'build_ext': build_ext, 'bdist_wheel': bdist_wheel_abi_none}, + ) + """ +) +ctypes_project.files["ctypesexample/csumlib.c"] = textwrap.dedent( + """ + #ifdef _WIN32 + #define LIBRARY_API __declspec(dllexport) + #else + #define LIBRARY_API + #endif + + #include + + + LIBRARY_API double *add_vec3(double *a, double *b) + { + double *res = malloc(sizeof(double) * 3); + + for (int i = 0; i < 3; ++i) + { + res[i] = a[i] + b[i]; + } + + return res; + } + """ +) +ctypes_project.files["ctypesexample/summing.py"] = textwrap.dedent( + """ + import ctypes + import pathlib + + # path of the shared library + libfile = pathlib.Path(__file__).parent / "csumlib.so" + csumlib = ctypes.CDLL(str(libfile)) + + type_vec3 = ctypes.POINTER(ctypes.c_double * 3) + + csumlib.add_vec3.restype = type_vec3 + csumlib.add_vec3.argtypes = [type_vec3, type_vec3] + def add(a: list, b: list) -> list: + a_p = (ctypes.c_double * 3)(*a) + b_p = (ctypes.c_double * 3)(*b) + r_p = csumlib.add_vec3(a_p,b_p) + + return [l for l in r_p.contents] + """ +) + +ctypes_project.files["test/add_test.py"] = textwrap.dedent( + """ + import ctypesexample.summing + + def test(): + a = [1, 2, 3] + b = [4, 5, 6] + assert ctypesexample.summing.add(a, b) == [5, 7, 9] + """ +) + + +def test_abi_none(tmp_path, capfd): + project_dir = tmp_path / "project" + ctypes_project.generate(project_dir) + + # build the wheels + actual_wheels = utils.cibuildwheel_run( + project_dir, + add_env={ + "CIBW_TEST_REQUIRES": "pytest", + "CIBW_TEST_COMMAND": "pytest {project}/test", + # limit the number of builds for test performance reasons + "CIBW_BUILD": "cp38-* cp310-* pp39-*", + }, + ) + + # check that the expected wheels are produced + expected_wheels = utils.expected_wheels("ctypesexample", "1.0.0", python_abi_tags=["py3-none"]) + assert set(actual_wheels) == set(expected_wheels) + + # check that each wheel was built once, and reused + captured = capfd.readouterr() + assert "Building wheel..." in captured.out + assert "Found previously built wheel" in captured.out diff --git a/test/test_limited_api.py b/test/test_limited_api.py deleted file mode 100644 index ea173bf5..00000000 --- a/test/test_limited_api.py +++ /dev/null @@ -1,50 +0,0 @@ -import textwrap - -from . import test_projects, utils - -limited_api_project = test_projects.new_c_project( - setup_py_add=textwrap.dedent( - r""" - cmdclass = {} - extension_kwargs = {} - if sys.version_info[:2] >= (3, 8): - from wheel.bdist_wheel import bdist_wheel as _bdist_wheel - - class bdist_wheel_abi3(_bdist_wheel): - def finalize_options(self): - _bdist_wheel.finalize_options(self) - self.root_is_pure = False - - def get_tag(self): - python, abi, plat = _bdist_wheel.get_tag(self) - return python, "abi3", plat - - cmdclass["bdist_wheel"] = bdist_wheel_abi3 - extension_kwargs["define_macros"] = [("Py_LIMITED_API", "0x03080000")] - extension_kwargs["py_limited_api"] = True - """ - ), - setup_py_extension_args_add="**extension_kwargs", - setup_py_setup_args_add="cmdclass=cmdclass", -) - - -def test(tmp_path): - project_dir = tmp_path / "project" - limited_api_project.generate(project_dir) - - # build the wheels - actual_wheels = utils.cibuildwheel_run( - project_dir, - add_env={ - "CIBW_SKIP": "pp* ", # PyPy does not have a Py_LIMITED_API equivalent - }, - ) - - # check that the expected wheels are produced - expected_wheels = [ - w.replace("cp38-cp38", "cp38-abi3") - for w in utils.expected_wheels("spam", "0.1.0") - if "-pp" not in w and "-cp39" not in w and "-cp310" not in w and "-cp311" not in w - ] - assert set(actual_wheels) == set(expected_wheels) diff --git a/test/utils.py b/test/utils.py index b6212021..d325be68 100644 --- a/test/utils.py +++ b/test/utils.py @@ -113,6 +113,7 @@ def expected_wheels( musllinux_versions=None, macosx_deployment_target="10.9", machine_arch=None, + python_abi_tags=None, ): """ Returns a list of expected wheels from a run of cibuildwheel. @@ -139,21 +140,22 @@ def expected_wheels( if musllinux_versions is None: musllinux_versions = ["musllinux_1_1"] - python_abi_tags = [ - "cp36-cp36m", - "cp37-cp37m", - "cp38-cp38", - "cp39-cp39", - "cp310-cp310", - "cp311-cp311", - ] + if python_abi_tags is None: + python_abi_tags = [ + "cp36-cp36m", + "cp37-cp37m", + "cp38-cp38", + "cp39-cp39", + "cp310-cp310", + "cp311-cp311", + ] - if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]: - python_abi_tags += ["pp37-pypy37_pp73", "pp38-pypy38_pp73", "pp39-pypy39_pp73"] + if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]: + python_abi_tags += ["pp37-pypy37_pp73", "pp38-pypy38_pp73", "pp39-pypy39_pp73"] - if platform == "macos" and machine_arch == "arm64": - # currently, arm64 macs are only supported by cp39, cp310 & cp311 - python_abi_tags = ["cp39-cp39", "cp310-cp310", "cp311-cp311"] + if platform == "macos" and machine_arch == "arm64": + # currently, arm64 macs are only supported by cp39, cp310 & cp311 + python_abi_tags = ["cp39-cp39", "cp310-cp310", "cp311-cp311"] wheels = [] @@ -185,10 +187,10 @@ def expected_wheels( ) elif platform == "windows": - if python_abi_tag.startswith("cp"): - platform_tags = ["win32", "win_amd64"] - else: + if python_abi_tag.startswith("pp"): platform_tags = ["win_amd64"] + else: + platform_tags = ["win32", "win_amd64"] elif platform == "macos": if python_abi_tag == "cp39-cp39" and machine_arch == "arm64": diff --git a/unit_test/utils_test.py b/unit_test/utils_test.py index 41e376fa..7f949a73 100644 --- a/unit_test/utils_test.py +++ b/unit_test/utils_test.py @@ -1,4 +1,8 @@ -from cibuildwheel.util import format_safe, prepare_command +from pathlib import PurePath + +import pytest + +from cibuildwheel.util import find_compatible_wheel, format_safe, prepare_command def test_format_safe(): @@ -46,3 +50,41 @@ def test_prepare_command(): prepare_command("{a}{a,b}{b:.2e}{c}{d%s}{e:3}{f[0]}", a="42", b="3.14159") == "42{a,b}{b:.2e}{c}{d%s}{e:3}{f[0]}" ) + + +@pytest.mark.parametrize( + "wheel,identifier", + ( + ("foo-0.1-cp38-abi3-win_amd64.whl", "cp310-win_amd64"), + ("foo-0.1-cp38-abi3-macosx_11_0_x86_64.whl", "cp310-macosx_x86_64"), + ("foo-0.1-cp38-abi3-manylinux2014_x86_64.whl", "cp310-manylinux_x86_64"), + ("foo-0.1-cp38-abi3-musllinux_1_1_x86_64.whl", "cp310-musllinux_x86_64"), + ("foo-0.1-py2.py3-none-win_amd64.whl", "cp310-win_amd64"), + ("foo-0.1-py2.py3-none-win_amd64.whl", "pp310-win_amd64"), + ("foo-0.1-py3-none-win_amd64.whl", "cp310-win_amd64"), + ("foo-0.1-py38-none-win_amd64.whl", "cp310-win_amd64"), + ("foo-0.1-py38-none-win_amd64.whl", "pp310-win_amd64"), + ), +) +def test_find_compatible_wheel_found(wheel: str, identifier: str): + wheel_ = PurePath(wheel) + found = find_compatible_wheel([wheel_], identifier) + assert found is wheel_ + + +@pytest.mark.parametrize( + "wheel,identifier", + ( + ("foo-0.1-cp38-abi3-win_amd64.whl", "cp310-win32"), + ("foo-0.1-cp38-abi3-win_amd64.whl", "cp37-win_amd64"), + ("foo-0.1-cp38-abi3-macosx_11_0_x86_64.whl", "cp310-macosx_universal2"), + ("foo-0.1-cp38-abi3-manylinux2014_x86_64.whl", "cp310-musllinux_x86_64"), + ("foo-0.1-cp38-abi3-musllinux_1_1_x86_64.whl", "cp310-manylinux_x86_64"), + ("foo-0.1-py2-none-win_amd64.whl", "cp310-win_amd64"), + ("foo-0.1-py38-none-win_amd64.whl", "cp37-win_amd64"), + ("foo-0.1-py38-none-win_amd64.whl", "pp37-win_amd64"), + ("foo-0.1-cp38-cp38-win_amd64.whl", "cp310-win_amd64"), + ), +) +def test_find_compatible_wheel_not_found(wheel: str, identifier: str): + assert find_compatible_wheel([PurePath(wheel)], identifier) is None From d02366f547da8b363d9bd2cf3bdefc7f17090cc8 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 3 Jul 2022 19:00:19 +0100 Subject: [PATCH 37/41] fix: multiple version tags per release bug in release tooling (#1166) --- bin/bump_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/bump_version.py b/bin/bump_version.py index 7e2b1b30..cab036ca 100755 --- a/bin/bump_version.py +++ b/bin/bump_version.py @@ -184,7 +184,7 @@ def bump_version() -> None: print() release_url = "https://github.com/pypa/cibuildwheel/releases/new?" + urllib.parse.urlencode( - {"tag": new_version} + {"tag": f"v{new_version}"} ) print("Then create a release at the URL:") print(f" {release_url}") From c4f1c31ccc68bd3311a0e84e861993c771641bba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 09:13:25 -0400 Subject: [PATCH 38/41] chore(deps): bump actions/setup-python from 3 to 4 (#1134) * chore(deps): bump actions/setup-python from 3 to 4 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Apply suggestions from code review Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner --- .github/workflows/test.yml | 10 +++++++--- .github/workflows/update-dependencies.yml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a588b526..b142f1c7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 + with: + python-version: "3.x" - uses: pre-commit/action@v3.0.0 - name: Check manifest run: pipx run nox -s check_manifest @@ -40,7 +42,7 @@ jobs: timeout-minutes: 180 steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 name: Install Python ${{ matrix.python_version }} with: python-version: ${{ matrix.python_version }} @@ -77,7 +79,9 @@ jobs: timeout-minutes: 180 steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 + with: + python-version: "3.x" - name: Install dependencies run: | python -m pip install ".[test]" diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 40af3595..208b36c4 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: "3.11-dev" - uses: excitedleigh/setup-nox@v2.1.0 From 227125cdf8633b7935ef468b760cf5ce2dfb07a6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 09:13:34 -0400 Subject: [PATCH 39/41] [pre-commit.ci] pre-commit autoupdate (#1167) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 22.3.0 → 22.6.0](https://github.com/psf/black/compare/22.3.0...22.6.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 89126ed2..1b4863c0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,7 +39,7 @@ repos: - id: isort - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 22.6.0 hooks: - id: black From 5ef488ba307a34c0e4bf4e55384ff8dbe470226a Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Tue, 5 Jul 2022 18:33:12 +0100 Subject: [PATCH 40/41] Bump version: v2.8.0 --- README.md | 24 ++++++++++-------------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 9 +++++++++ docs/faq.md | 4 ++-- docs/setup.md | 4 ++-- examples/appveyor-minimal.yml | 2 +- examples/azure-pipelines-minimal.yml | 6 +++--- examples/circleci-minimal.yml | 4 ++-- examples/github-apple-silicon.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 ++-- setup.cfg | 2 +- 17 files changed, 40 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index fb40fc7f..5d51e90c 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ jobs: - uses: actions/setup-python@v3 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.7.0 + run: python -m pip install cibuildwheel==2.8.0 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -204,6 +204,15 @@ Changelog +### v2.8.0 + +_5 July 2022_ + +- ✨ You can now run cibuildwheel on Podman, as an alternate container engine to Docker, which remains the default. This is useful in environments where a Docker daemon isn't available, for example, it can be run inside a Docker container, or without root access. To use Podman, set the [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine) option. (#966) +- ✨ Adds support for building `py3-none-{platform}` wheels. These wheels contain native extension code, but don't use the Python APIs. Typically, they're bridged to Python using a FFI module like [ctypes](https://docs.python.org/3/library/ctypes.html) or [cffi](https://cffi.readthedocs.io/en/latest/). Because they don't use Python ABI, the wheels are more compatible - they work across many Python versions. Check out this [example ctypes project](https://github.com/joerick/python-ctypes-package-sample) to see an example of how it works. (#1151) +- 🛠 cibuildwheel will now error if multiple builds in a single run produce the same wheel filename, as this indicates a misconfiguration. (#1152) +- 📚 A few docs improvements and updates to keep things up-to-date. + ### v2.7.0 _17 June 2022_ @@ -236,19 +245,6 @@ _29 April 2022_ - 🐛 Workaround a permissions issue on Linux relating to newer versions of git and setuptools_scm (#1095) - 📚 Minor docs improvements -### v2.4.0 - -_2 April 2022_ - -- ✨ cibuildwheel now supports running locally on Windows and macOS (as well as Linux). On macOS, you'll have to install the versions of Pythons that you want to use from Python.org, and cibuildwheel will use them. On Windows, cibuildwheel will install it's own versions of Python. Check out [the documentation](https://cibuildwheel.readthedocs.io/en/stable/setup/#local) for instructions. (#974) -- ✨ Added support for building PyPy 3.9 wheels. (#1031) -- ✨ Listing at the end of the build now displays the size of each wheel (#975) -- 🐛 Workaround a connection timeout bug on Travis CI ppc64le runners (#906) -- 🐛 Fix an encoding error when reading setup.py in the wrong encoding (#977) -- 🛠 Setuptools updated to 61.3.0, including experimental support for reading config from pyproject.toml(PEP 621). This could change the behaviour of your build if you have a pyproject.toml with a `[project]` table, because that takes precedence over setup.py and setup.cfg. Check out the [setuptools docs](https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html) and the [project metadata specification](https://packaging.python.org/en/latest/specifications/declaring-project-metadata/) for more info. -- 🛠 Many other dependency updates. -- 📚 Minor docs improvements - --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index 2614ce9d..892994aa 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "2.7.0" +__version__ = "2.8.0" diff --git a/docs/changelog.md b/docs/changelog.md index 29928223..16015c49 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,15 @@ title: Changelog --- +### v2.8.0 + +_5 July 2022_ + +- ✨ You can now run cibuildwheel on Podman, as an alternate container engine to Docker, which remains the default. This is useful in environments where a Docker daemon isn't available, for example, it can be run inside a Docker container, or without root access. To use Podman, set the [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine) option. (#966) +- ✨ Adds support for building `py3-none-{platform}` wheels. These wheels contain native extension code, but don't use the Python APIs. Typically, they're bridged to Python using a FFI module like [ctypes](https://docs.python.org/3/library/ctypes.html) or [cffi](https://cffi.readthedocs.io/en/latest/). Because they don't use Python ABI, the wheels are more compatible - they work across many Python versions. Check out this [example ctypes project](https://github.com/joerick/python-ctypes-package-sample) to see an example of how it works. (#1151) +- 🛠 cibuildwheel will now error if multiple builds in a single run produce the same wheel filename, as this indicates a misconfiguration. (#1152) +- 📚 A few docs improvements and updates to keep things up-to-date. + ### v2.7.0 _17 June 2022_ diff --git a/docs/faq.md b/docs/faq.md index 114df06d..18756756 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -133,7 +133,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v2.7.0 +uses: pypa/cibuildwheel@v2.8.0 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -155,7 +155,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==2.7.0 +cibuildwheel==2.8.0 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: diff --git a/docs/setup.md b/docs/setup.md index 5af62a5f..73aa8619 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -182,7 +182,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/ - uses: actions/checkout@v3 - name: Build wheels - run: pipx run cibuildwheel==2.7.0 + run: pipx run cibuildwheel==2.8.0 - uses: actions/upload-artifact@v3 with: @@ -217,7 +217,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/ - uses: actions/setup-python@v3 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.7.0 + run: python -m pip install cibuildwheel==2.8.0 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse diff --git a/examples/appveyor-minimal.yml b/examples/appveyor-minimal.yml index a943ac36..2d12d54e 100644 --- a/examples/appveyor-minimal.yml +++ b/examples/appveyor-minimal.yml @@ -12,7 +12,7 @@ stack: python 3.7 init: - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH% -install: python -m pip install cibuildwheel==2.7.0 +install: python -m pip install cibuildwheel==2.8.0 build_script: python -m cibuildwheel --output-dir wheelhouse diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index 4a275835..de1847e6 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==2.7.0 + pip3 install cibuildwheel==2.8.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==2.7.0 + python3 -m pip install cibuildwheel==2.8.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==2.7.0 + pip install cibuildwheel==2.8.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 95eb1bcc..d490077f 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - pip3 install --user cibuildwheel==2.7.0 + pip3 install --user cibuildwheel==2.8.0 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -25,7 +25,7 @@ jobs: - run: name: Build the OS X wheels. command: | - pip3 install cibuildwheel==2.7.0 + pip3 install cibuildwheel==2.8.0 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/github-apple-silicon.yml b/examples/github-apple-silicon.yml index dd695220..eafdf216 100644 --- a/examples/github-apple-silicon.yml +++ b/examples/github-apple-silicon.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - name: Build wheels - uses: pypa/cibuildwheel@v2.7.0 + uses: pypa/cibuildwheel@v2.8.0 env: CIBW_ARCHS_MACOS: x86_64 universal2 diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index df2e846c..bb4a4e31 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v3 - name: Build wheels - uses: pypa/cibuildwheel@v2.7.0 + uses: pypa/cibuildwheel@v2.8.0 - uses: actions/upload-artifact@v3 with: diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index a4c4a13b..8d6ce692 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v3 - name: Build wheels - uses: pypa/cibuildwheel@v2.7.0 + uses: pypa/cibuildwheel@v2.8.0 # env: # CIBW_SOME_OPTION: value # ... diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index 38fe7248..dcdcdbea 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -25,7 +25,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.7.0 + uses: pypa/cibuildwheel@v2.8.0 env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index 1a3d3b6b..8971b8fa 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==2.7.0 + - python -m pip install cibuildwheel==2.8.0 - cibuildwheel --output-dir wheelhouse artifacts: paths: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index 9ad49bc6..6a26d576 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -19,7 +19,7 @@ jobs: - ln -s /c/Python38/python.exe /c/Python38/python3.exe install: - - python3 -m pip install cibuildwheel==2.7.0 + - python3 -m pip install cibuildwheel==2.8.0 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 4ff2971f..bbfabdb4 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -25,7 +25,7 @@ jobs: - ln -s /c/Python38/python.exe /c/Python38/python3.exe install: - - python3 -m pip install cibuildwheel==2.7.0 + - python3 -m pip install cibuildwheel==2.8.0 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index db739623..61a34ce7 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -55,7 +55,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==2.7.0 twine + install: python3 -m pip install cibuildwheel==2.8.0 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -63,7 +63,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==2.7.0 twine + install: python3 -m pip install cibuildwheel==2.8.0 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/setup.cfg b/setup.cfg index 838631e0..dab4ab94 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = cibuildwheel -version = 2.7.0 +version = 2.8.0 description = Build Python wheels on CI with minimal configuration. long_description = file: README.md long_description_content_type = text/markdown From f349304eb7f9f723a011a6d09cf261bec463a985 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Tue, 5 Jul 2022 18:36:03 +0100 Subject: [PATCH 41/41] Small changelog wording changes --- README.md | 8 ++++++-- docs/changelog.md | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5d51e90c..84f1947b 100644 --- a/README.md +++ b/README.md @@ -208,8 +208,12 @@ Changelog _5 July 2022_ -- ✨ You can now run cibuildwheel on Podman, as an alternate container engine to Docker, which remains the default. This is useful in environments where a Docker daemon isn't available, for example, it can be run inside a Docker container, or without root access. To use Podman, set the [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine) option. (#966) -- ✨ Adds support for building `py3-none-{platform}` wheels. These wheels contain native extension code, but don't use the Python APIs. Typically, they're bridged to Python using a FFI module like [ctypes](https://docs.python.org/3/library/ctypes.html) or [cffi](https://cffi.readthedocs.io/en/latest/). Because they don't use Python ABI, the wheels are more compatible - they work across many Python versions. Check out this [example ctypes project](https://github.com/joerick/python-ctypes-package-sample) to see an example of how it works. (#1151) +- ✨ You can now run cibuildwheel on Podman, as an alternate container engine to Docker (which remains the default). This is useful in environments where a Docker daemon isn't available, for example, it can be run inside a Docker container, or without root access. To use Podman, set the [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine) option. (#966) +- ✨ Adds support for building `py3-none-{platform}` wheels. This works the same as ABI3 - wheels won't be rebuilt, but tests will still be run across all selected versions of Python. + + > These wheels contain native extension code, but don't use the Python APIs. Typically, they're bridged to Python using a FFI module like [ctypes](https://docs.python.org/3/library/ctypes.html) or [cffi](https://cffi.readthedocs.io/en/latest/). Because they don't use Python ABI, the wheels are more compatible - they work across many Python versions. + + Check out this [example ctypes project](https://github.com/joerick/python-ctypes-package-sample) to see an example of how it works. (#1151) - 🛠 cibuildwheel will now error if multiple builds in a single run produce the same wheel filename, as this indicates a misconfiguration. (#1152) - 📚 A few docs improvements and updates to keep things up-to-date. diff --git a/docs/changelog.md b/docs/changelog.md index 16015c49..f5f655fe 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -6,8 +6,12 @@ title: Changelog _5 July 2022_ -- ✨ You can now run cibuildwheel on Podman, as an alternate container engine to Docker, which remains the default. This is useful in environments where a Docker daemon isn't available, for example, it can be run inside a Docker container, or without root access. To use Podman, set the [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine) option. (#966) -- ✨ Adds support for building `py3-none-{platform}` wheels. These wheels contain native extension code, but don't use the Python APIs. Typically, they're bridged to Python using a FFI module like [ctypes](https://docs.python.org/3/library/ctypes.html) or [cffi](https://cffi.readthedocs.io/en/latest/). Because they don't use Python ABI, the wheels are more compatible - they work across many Python versions. Check out this [example ctypes project](https://github.com/joerick/python-ctypes-package-sample) to see an example of how it works. (#1151) +- ✨ You can now run cibuildwheel on Podman, as an alternate container engine to Docker (which remains the default). This is useful in environments where a Docker daemon isn't available, for example, it can be run inside a Docker container, or without root access. To use Podman, set the [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine) option. (#966) +- ✨ Adds support for building `py3-none-{platform}` wheels. This works the same as ABI3 - wheels won't be rebuilt, but tests will still be run across all selected versions of Python. + + > These wheels contain native extension code, but don't use the Python APIs. Typically, they're bridged to Python using a FFI module like [ctypes](https://docs.python.org/3/library/ctypes.html) or [cffi](https://cffi.readthedocs.io/en/latest/). Because they don't use Python ABI, the wheels are more compatible - they work across many Python versions. + + Check out this [example ctypes project](https://github.com/joerick/python-ctypes-package-sample) to see an example of how it works. (#1151) - 🛠 cibuildwheel will now error if multiple builds in a single run produce the same wheel filename, as this indicates a misconfiguration. (#1152) - 📚 A few docs improvements and updates to keep things up-to-date.