fix: enforce minimum version of docker/podman (#1961)
* fix: enforce minimum version of docker/podman This allows to always pass `--platform` to the OCI engine thus fixing issues with multiarch images. * Allow older versions with warnings * Upgrade docker on Travis CI * fix: use `docker cp` instead of `tar` * Enforce docker>=24.0 * move log to include container.copy_into * fix: travis-ci, only update docker on aarch64 * skip test_multiarch_image on s390x / ppc64le * skip flaky test * chore: only install test deps on Travis CI * fix: do not try to pull images tagged `cibw_local` * use "--pull=never" for local images * Use docker image inspect to check if an image needs to be pulled
This commit is contained in:
@@ -21,7 +21,7 @@ def test_podman(tmp_path, capfd, request):
|
||||
actual_wheels = utils.cibuildwheel_run(
|
||||
project_dir,
|
||||
add_env={
|
||||
"CIBW_ARCHS": "x86_64",
|
||||
"CIBW_ARCHS": "native",
|
||||
"CIBW_BEFORE_ALL": "echo 'test log statement from before-all'",
|
||||
"CIBW_CONTAINER_ENGINE": "podman",
|
||||
},
|
||||
@@ -29,9 +29,7 @@ def test_podman(tmp_path, capfd, request):
|
||||
)
|
||||
|
||||
# check that the expected wheels are produced
|
||||
expected_wheels = [
|
||||
w for w in utils.expected_wheels("spam", "0.1.0", single_python=True) if "x86_64" in w
|
||||
]
|
||||
expected_wheels = utils.expected_wheels("spam", "0.1.0", single_python=True, single_arch=True)
|
||||
assert set(actual_wheels) == set(expected_wheels)
|
||||
|
||||
# check that stdout is bring passed-though from container correctly
|
||||
|
||||
Reference in New Issue
Block a user