dfd01af9aa
* fix: parse version strings that include dashes It's possible for some container engines to report their versions with a dash (e.g., "4.9.4-rhel"), which breaks packaging.version.Version's ability to parse the string. This commit introduces a version_from_string method which santizies the version string and returns an instance of Version. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * cleanup: pacify ruff * cleanup: further pacify ruff * fix: properly define _version_from_string method Also, lift the method up and prefix with a "_" to better match the existing conventions * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * refactor: more robust podman ver check Use the "podman --version" command instead of "podman version -f {{json .}}" for better reliability across distributions. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: oci engine version check Lower Docker API check to 1.41 Podman versions are not PEP440 compliant, remove distro specific suffixes before parsing. Add tests with real-world outputs and some made up ones. * fix: UX on OCIEngineTooOldError * Add FlexibleVersion per review comment --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: mayeut <mayeut@users.noreply.github.com>
224 lines
7.9 KiB
Python
224 lines
7.9 KiB
Python
from __future__ import annotations
|
|
|
|
import textwrap
|
|
from pathlib import PurePath
|
|
|
|
import pytest
|
|
|
|
from cibuildwheel.util import (
|
|
FlexibleVersion,
|
|
find_compatible_wheel,
|
|
fix_ansi_codes_for_github_actions,
|
|
format_safe,
|
|
parse_key_value_string,
|
|
prepare_command,
|
|
)
|
|
|
|
|
|
def test_format_safe():
|
|
assert format_safe("{wheel}", wheel="filename.whl") == "filename.whl"
|
|
assert format_safe("command #{wheel}", wheel="filename.whl") == "command {wheel}"
|
|
assert format_safe("{command #{wheel}}", wheel="filename.whl") == "{command {wheel}}"
|
|
|
|
# check unmatched brackets
|
|
assert format_safe("{command {wheel}", wheel="filename.whl") == "{command filename.whl"
|
|
|
|
# check positional-style arguments i.e. {}
|
|
assert (
|
|
format_safe("find . -name * -exec ls -a {} \\;", project="/project")
|
|
== "find . -name * -exec ls -a {} \\;"
|
|
)
|
|
|
|
assert format_safe("{param} {param}", param="1") == "1 1"
|
|
assert format_safe("# {param} {param}", param="1") == "# 1 1"
|
|
assert format_safe("#{not_a_param} {param}", param="1") == "#{not_a_param} 1"
|
|
|
|
|
|
def test_prepare_command():
|
|
assert prepare_command("python -m {project}", project="project") == "python -m project"
|
|
assert prepare_command("python -m {something}", project="project") == "python -m {something}"
|
|
assert (
|
|
prepare_command("python -m {something.abc}", project="project")
|
|
== "python -m {something.abc}"
|
|
)
|
|
|
|
assert (
|
|
prepare_command("python -m {something.abc[4]:3f}", project="project")
|
|
== "python -m {something.abc[4]:3f}"
|
|
)
|
|
|
|
# test backslashes in the replacement
|
|
assert (
|
|
prepare_command(
|
|
"command {wheel} \\Users\\Temp\\output_dir", wheel="\\Temporary Files\\cibw"
|
|
)
|
|
== "command \\Temporary Files\\cibw \\Users\\Temp\\output_dir"
|
|
)
|
|
|
|
# test some unusual syntax that used to trip up the str.format approach
|
|
assert (
|
|
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
|
|
|
|
|
|
def test_fix_ansi_codes_for_github_actions():
|
|
input = textwrap.dedent(
|
|
"""
|
|
This line is normal
|
|
\033[1mThis line is bold
|
|
This line is also bold
|
|
\033[31m this line is red and bold
|
|
This line is red and bold, too\033[0m
|
|
This line is normal again
|
|
"""
|
|
)
|
|
|
|
expected = textwrap.dedent(
|
|
"""
|
|
This line is normal
|
|
\033[1mThis line is bold
|
|
\033[1mThis line is also bold
|
|
\033[1m\033[31m this line is red and bold
|
|
\033[1m\033[31mThis line is red and bold, too\033[0m
|
|
This line is normal again
|
|
"""
|
|
)
|
|
|
|
output = fix_ansi_codes_for_github_actions(input)
|
|
|
|
assert output == expected
|
|
|
|
|
|
def test_parse_key_value_string():
|
|
assert parse_key_value_string("bar", positional_arg_names=["foo"]) == {"foo": ["bar"]}
|
|
assert parse_key_value_string("foo:bar", kw_arg_names=["foo"]) == {"foo": ["bar"]}
|
|
with pytest.raises(ValueError, match="Too many positional arguments"):
|
|
parse_key_value_string("bar")
|
|
with pytest.raises(ValueError, match="Unknown field name"):
|
|
parse_key_value_string("foo:bar")
|
|
assert parse_key_value_string("foo:bar", kw_arg_names=["foo"]) == {"foo": ["bar"]}
|
|
assert parse_key_value_string("foo:bar", positional_arg_names=["foo"]) == {"foo": ["bar"]}
|
|
assert parse_key_value_string("foo: bar", kw_arg_names=["foo"]) == {"foo": ["bar"]}
|
|
assert parse_key_value_string("foo: bar", kw_arg_names=["foo"]) == {"foo": ["bar"]}
|
|
assert parse_key_value_string("foo: bar; baz: qux", kw_arg_names=["foo", "baz"]) == {
|
|
"foo": ["bar"],
|
|
"baz": ["qux"],
|
|
}
|
|
|
|
# some common options
|
|
assert parse_key_value_string(
|
|
"docker; create_args: --some-option --another-option=foo",
|
|
positional_arg_names=["name"],
|
|
kw_arg_names=["create_args"],
|
|
) == {
|
|
"name": ["docker"],
|
|
"create_args": ["--some-option", "--another-option=foo"],
|
|
}
|
|
# semicolon in value
|
|
assert parse_key_value_string(
|
|
"docker; create_args: --some-option='this; that'",
|
|
positional_arg_names=["name"],
|
|
kw_arg_names=["create_args"],
|
|
) == {
|
|
"name": ["docker"],
|
|
"create_args": ["--some-option=this; that"],
|
|
}
|
|
# colon in value
|
|
assert parse_key_value_string(
|
|
"docker; create_args: --mount a:b",
|
|
positional_arg_names=["name"],
|
|
kw_arg_names=["create_args"],
|
|
) == {
|
|
"name": ["docker"],
|
|
"create_args": ["--mount", "a:b"],
|
|
}
|
|
assert parse_key_value_string(
|
|
"docker;create_args:--mount a:b",
|
|
positional_arg_names=["name"],
|
|
kw_arg_names=["create_args"],
|
|
) == {
|
|
"name": ["docker"],
|
|
"create_args": ["--mount", "a:b"],
|
|
}
|
|
# quoted value with spaces
|
|
assert parse_key_value_string(
|
|
"docker;create_args:'some string with spaces'",
|
|
positional_arg_names=["name"],
|
|
kw_arg_names=["create_args"],
|
|
) == {
|
|
"name": ["docker"],
|
|
"create_args": ["some string with spaces"],
|
|
}
|
|
|
|
# colon in positional value
|
|
assert parse_key_value_string(
|
|
"docker; --mount a:b",
|
|
positional_arg_names=["name", "create_args"],
|
|
) == {
|
|
"name": ["docker"],
|
|
"create_args": ["--mount", "a:b"],
|
|
}
|
|
|
|
# empty option gives empty array
|
|
assert parse_key_value_string(
|
|
"docker;create_args:",
|
|
positional_arg_names=["name"],
|
|
kw_arg_names=["create_args"],
|
|
) == {
|
|
"name": ["docker"],
|
|
"create_args": [],
|
|
}
|
|
|
|
|
|
def test_flexible_version_comparisons():
|
|
assert FlexibleVersion("2.0") == FlexibleVersion("2")
|
|
assert FlexibleVersion("2.0") < FlexibleVersion("2.1")
|
|
assert FlexibleVersion("2.1") > FlexibleVersion("2")
|
|
assert FlexibleVersion("1.9.9") < FlexibleVersion("2.0")
|
|
assert FlexibleVersion("1.10") > FlexibleVersion("1.9.9")
|
|
assert FlexibleVersion("3.0.1") > FlexibleVersion("3.0")
|
|
assert FlexibleVersion("3.0") < FlexibleVersion("3.0.1")
|
|
# Suffix should not affect comparisons
|
|
assert FlexibleVersion("1.0.1-rhel") > FlexibleVersion("1.0")
|
|
assert FlexibleVersion("1.0.1-rhel") < FlexibleVersion("1.1")
|
|
assert FlexibleVersion("1.0.1") == FlexibleVersion("v1.0.1")
|