Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve the formatting of the preamble

Browse Source
This commit is contained in:
Joe Rickerby
2022-11-26 17:16:54 +00:00
parent 9c6416d4ac
commit 8d05681491
9 changed files with 223 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_test/linux_build_steps_test.py
+3 -5
View File
@@ -6,9 +6,7 @@ from pprint import pprint
import cibuildwheel.linux
import cibuildwheel.oci_container
from cibuildwheel.options import Options
from .utils import get_default_command_line_arguments
from cibuildwheel.options import CommandLineArguments, Options
def test_linux_container_split(tmp_path: Path, monkeypatch):
@@ -16,7 +14,7 @@ def test_linux_container_split(tmp_path: Path, monkeypatch):
Tests splitting linux builds by container image and before_all
"""
args = get_default_command_line_arguments()
args = CommandLineArguments.defaults()
args.platform = "linux"
(tmp_path / "pyproject.toml").write_text(
@@ -42,7 +40,7 @@ def test_linux_container_split(tmp_path: Path, monkeypatch):
)
monkeypatch.chdir(tmp_path)
options = Options("linux", command_line_arguments=args)
options = Options("linux", command_line_arguments=args, environ={})
python_configurations = cibuildwheel.linux.get_python_configurations(
options.globals.build_selector, options.globals.architectures
unit_test/options_test.py
+22 -19
View File
@@ -10,13 +10,16 @@ import pytest
from cibuildwheel.__main__ import get_build_identifiers
from cibuildwheel.bashlex_eval import local_environment_executor
from cibuildwheel.environment import parse_environment
from cibuildwheel.options import Options, _get_pinned_container_images
from .utils import get_default_command_line_arguments
from cibuildwheel.options import (
CommandLineArguments,
Options,
_get_pinned_container_images,
)
PYPROJECT_1 = """
[tool.cibuildwheel]
build = ["cp38*", "cp37*"]
skip = ["*musllinux*"]
environment = {FOO="BAR"}
test-command = "pyproject"
@@ -39,12 +42,12 @@ def test_options_1(tmp_path, monkeypatch):
with tmp_path.joinpath("pyproject.toml").open("w") as f:
f.write(PYPROJECT_1)
args = get_default_command_line_arguments()
args = CommandLineArguments.defaults()
args.package_dir = tmp_path
monkeypatch.setattr(platform_module, "machine", lambda: "x86_64")
options = Options(platform="linux", command_line_arguments=args)
options = Options(platform="linux", command_line_arguments=args, environ={})
identifiers = get_build_identifiers(
platform="linux",
@@ -53,9 +56,8 @@ def test_options_1(tmp_path, monkeypatch):
)
override_display = """\
test_command: 'pyproject'
cp37-manylinux_x86_64: 'pyproject-override'"""
*: pyproject
cp37-manylinux_x86_64, cp37-manylinux_i686: pyproject-override"""
print(options.summary(identifiers))
assert override_display in options.summary(identifiers)
@@ -82,13 +84,12 @@ def test_passthrough(tmp_path, monkeypatch):
with tmp_path.joinpath("pyproject.toml").open("w") as f:
f.write(PYPROJECT_1)
args = get_default_command_line_arguments()
args = CommandLineArguments.defaults()
args.package_dir = tmp_path
monkeypatch.setattr(platform_module, "machine", lambda: "x86_64")
monkeypatch.setenv("EXAMPLE_ENV", "ONE")
options = Options(platform="linux", command_line_arguments=args)
options = Options(platform="linux", command_line_arguments=args, environ={"EXAMPLE_ENV": "ONE"})
default_build_options = options.build_options(identifier=None)
@@ -110,14 +111,16 @@ def test_passthrough(tmp_path, monkeypatch):
],
)
def test_passthrough_evil(tmp_path, monkeypatch, env_var_value):
args = get_default_command_line_arguments()
args = CommandLineArguments.defaults()
args.package_dir = tmp_path
monkeypatch.setattr(platform_module, "machine", lambda: "x86_64")
monkeypatch.setenv("CIBW_ENVIRONMENT_PASS_LINUX", "ENV_VAR")
options = Options(platform="linux", command_line_arguments=args)
options = Options(
platform="linux",
command_line_arguments=args,
environ={"CIBW_ENVIRONMENT_PASS_LINUX": "ENV_VAR", "ENV_VAR": env_var_value},
)
monkeypatch.setenv("ENV_VAR", env_var_value)
parsed_environment = options.build_options(identifier=None).environment
assert parsed_environment.as_dictionary(prev_environment={}) == {"ENV_VAR": env_var_value}
@@ -138,7 +141,7 @@ xfail_env_parse = pytest.mark.xfail(
],
)
def test_toml_environment_evil(tmp_path, monkeypatch, env_var_value):
args = get_default_command_line_arguments()
args = CommandLineArguments.defaults()
args.package_dir = tmp_path
tmp_path.joinpath("pyproject.toml").write_text(
@@ -150,7 +153,7 @@ def test_toml_environment_evil(tmp_path, monkeypatch, env_var_value):
)
)
options = Options(platform="linux", command_line_arguments=args)
options = Options(platform="linux", command_line_arguments=args, environ={})
parsed_environment = options.build_options(identifier=None).environment
assert parsed_environment.as_dictionary(prev_environment={}) == {"EXAMPLE": env_var_value}
@@ -174,7 +177,7 @@ def test_toml_environment_evil(tmp_path, monkeypatch, env_var_value):
],
)
def test_toml_environment_quoting(tmp_path: Path, toml_assignment, result_value):
args = get_default_command_line_arguments()
args = CommandLineArguments.defaults()
args.package_dir = tmp_path
tmp_path.joinpath("pyproject.toml").write_text(
@@ -186,7 +189,7 @@ def test_toml_environment_quoting(tmp_path: Path, toml_assignment, result_value)
)
)
options = Options(platform="linux", command_line_arguments=args)
options = Options(platform="linux", command_line_arguments=args, environ={})
parsed_environment = options.build_options(identifier=None).environment
environment_values = parsed_environment.as_dictionary(
prev_environment={**os.environ, "PARAM": "spam"},
unit_test/options_toml_test.py
+42 -28
View File
@@ -35,7 +35,7 @@ def test_simple_settings(tmp_path, platform, fname):
config_file_path: Path = tmp_path / fname
config_file_path.write_text(PYPROJECT_1)
options_reader = OptionsReader(config_file_path, platform=platform)
options_reader = OptionsReader(config_file_path, platform=platform, environ={})
assert options_reader.get("build", env_plat=False, sep=" ") == "cp39*"
@@ -72,16 +72,20 @@ def test_simple_settings(tmp_path, platform, fname):
def test_envvar_override(tmp_path, platform, monkeypatch):
monkeypatch.setenv("CIBW_BUILD", "cp38*")
monkeypatch.setenv("CIBW_MANYLINUX_X86_64_IMAGE", "manylinux_2_24")
monkeypatch.setenv("CIBW_TEST_COMMAND", "mytest")
monkeypatch.setenv("CIBW_TEST_REQUIRES", "docs")
monkeypatch.setenv("CIBW_TEST_REQUIRES_LINUX", "scod")
config_file_path: Path = tmp_path / "pyproject.toml"
config_file_path.write_text(PYPROJECT_1)
options_reader = OptionsReader(config_file_path, platform=platform)
options_reader = OptionsReader(
config_file_path,
platform=platform,
environ={
"CIBW_BUILD": "cp38*",
"CIBW_MANYLINUX_X86_64_IMAGE": "manylinux_2_24",
"CIBW_TEST_COMMAND": "mytest",
"CIBW_TEST_REQUIRES": "docs",
"CIBW_TEST_REQUIRES_LINUX": "scod",
},
)
assert options_reader.get("archs", sep=" ") == "auto"
@@ -104,18 +108,18 @@ def test_project_global_override_default_platform(tmp_path, platform):
repair-wheel-command = "repair-project-global"
"""
)
options_reader = OptionsReader(pyproject_toml, platform=platform)
options_reader = OptionsReader(pyproject_toml, platform=platform, environ={})
assert options_reader.get("repair-wheel-command") == "repair-project-global"
def test_env_global_override_default_platform(tmp_path, platform, monkeypatch):
monkeypatch.setenv("CIBW_REPAIR_WHEEL_COMMAND", "repair-env-global")
options_reader = OptionsReader(platform=platform)
options_reader = OptionsReader(
platform=platform, environ={"CIBW_REPAIR_WHEEL_COMMAND": "repair-env-global"}
)
assert options_reader.get("repair-wheel-command") == "repair-env-global"
def test_env_global_override_project_platform(tmp_path, platform, monkeypatch):
monkeypatch.setenv("CIBW_REPAIR_WHEEL_COMMAND", "repair-env-global")
pyproject_toml = tmp_path / "pyproject.toml"
pyproject_toml.write_text(
"""
@@ -127,7 +131,13 @@ repair-wheel-command = "repair-project-windows"
repair-wheel-command = "repair-project-macos"
"""
)
options_reader = OptionsReader(pyproject_toml, platform=platform)
options_reader = OptionsReader(
pyproject_toml,
platform=platform,
environ={
"CIBW_REPAIR_WHEEL_COMMAND": "repair-env-global",
},
)
assert options_reader.get("repair-wheel-command") == "repair-env-global"
@@ -145,7 +155,7 @@ repair-wheel-command = "repair-project-macos"
repair-wheel-command = "repair-project-global"
"""
)
options_reader = OptionsReader(pyproject_toml, platform=platform)
options_reader = OptionsReader(pyproject_toml, platform=platform, environ={})
assert options_reader.get("repair-wheel-command") == f"repair-project-{platform}"
@@ -161,7 +171,7 @@ repairs-wheel-command = "repair-project-linux"
)
with pytest.raises(ConfigOptionError) as excinfo:
OptionsReader(pyproject_toml, platform="linux")
OptionsReader(pyproject_toml, platform="linux", environ={})
assert "repair-wheel-command" in str(excinfo.value)
@@ -178,7 +188,7 @@ repair_wheel_command = "repair-project-linux"
)
with pytest.raises(ConfigOptionError) as excinfo:
OptionsReader(pyproject_toml, platform="linux")
OptionsReader(pyproject_toml, platform="linux", environ={})
assert "repair-wheel-command" in str(excinfo.value)
@@ -192,7 +202,7 @@ repair-wheel-command = "repair-project-linux"
"""
)
with pytest.raises(ConfigOptionError):
OptionsReader(pyproject_toml, platform="linux")
OptionsReader(pyproject_toml, platform="linux", environ={})
def test_unsupported_join(tmp_path):
@@ -203,7 +213,7 @@ def test_unsupported_join(tmp_path):
build = ["1", "2"]
"""
)
options_reader = OptionsReader(pyproject_toml, platform="linux")
options_reader = OptionsReader(pyproject_toml, platform="linux", environ={})
assert "1, 2" == options_reader.get("build", sep=", ")
with pytest.raises(ConfigOptionError):
@@ -219,9 +229,9 @@ manylinux-x86_64-image = "manylinux1"
"""
)
disallow = {"windows": {"manylinux-x86_64-image"}}
OptionsReader(pyproject_toml, platform="linux", disallow=disallow)
OptionsReader(pyproject_toml, platform="linux", disallow=disallow, environ={})
with pytest.raises(ConfigOptionError):
OptionsReader(pyproject_toml, platform="windows", disallow=disallow)
OptionsReader(pyproject_toml, platform="windows", disallow=disallow, environ={})
def test_environment_override_empty(tmp_path, monkeypatch):
@@ -234,10 +244,14 @@ manylinux-x86_64-image = ""
"""
)
monkeypatch.setenv("CIBW_MANYLINUX_I686_IMAGE", "")
monkeypatch.setenv("CIBW_MANYLINUX_AARCH64_IMAGE", "manylinux1")
options_reader = OptionsReader(pyproject_toml, platform="linux")
options_reader = OptionsReader(
pyproject_toml,
platform="linux",
environ={
"CIBW_MANYLINUX_I686_IMAGE": "",
"CIBW_MANYLINUX_AARCH64_IMAGE": "manylinux1",
},
)
assert options_reader.get("manylinux-x86_64-image") == ""
assert options_reader.get("manylinux-i686-image") == ""
@@ -306,7 +320,7 @@ def test_pyproject_2(tmp_path, platform):
pyproject_toml: Path = tmp_path / "pyproject.toml"
pyproject_toml.write_text(PYPROJECT_2)
options_reader = OptionsReader(config_file_path=pyproject_toml, platform=platform)
options_reader = OptionsReader(config_file_path=pyproject_toml, platform=platform, environ={})
assert options_reader.get("test-command") == "pyproject"
with options_reader.identifier("random"):
@@ -330,7 +344,7 @@ test-command = "pyproject-override"
)
with pytest.raises(ConfigOptionError):
OptionsReader(config_file_path=pyproject_toml, platform=platform)
OptionsReader(config_file_path=pyproject_toml, platform=platform, environ={})
def test_config_settings(tmp_path):
@@ -343,7 +357,7 @@ other = ["two", "three"]
"""
)
options_reader = OptionsReader(config_file_path=pyproject_toml, platform="linux")
options_reader = OptionsReader(config_file_path=pyproject_toml, platform="linux", environ={})
assert (
options_reader.get("config-settings", table={"item": '{k}="{v}"', "sep": " "})
== 'example="one" other="two" other="three"'
@@ -359,7 +373,7 @@ def test_pip_config_settings(tmp_path):
"""
)
options_reader = OptionsReader(config_file_path=pyproject_toml, platform="linux")
options_reader = OptionsReader(config_file_path=pyproject_toml, platform="linux", environ={})
assert (
options_reader.get(
"config-settings", table={"item": "--config-settings='{k}=\"{v}\"'", "sep": " "}
unit_test/utils.py
-21
View File
@@ -1,21 +0,0 @@
from __future__ import annotations
from pathlib import Path
from cibuildwheel.options import CommandLineArguments
def get_default_command_line_arguments() -> CommandLineArguments:
defaults = CommandLineArguments(
platform="auto",
allow_empty=False,
archs=None,
only=None,
config_file="",
output_dir=Path("wheelhouse"),
package_dir=Path("."),
prerelease_pythons=False,
print_build_identifiers=False,
)
return defaults