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

style: activate string normalization

Browse Source
This commit is contained in:
Henry Schreiner
2021-05-03 13:12:36 -04:00
committed by Henry Schreiner
parent d1900f6a05
commit bda76b21cb
54 changed files with 1598 additions and 1599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/architecture.py
+33 -33
View File
@@ -6,7 +6,7 @@ from typing import Set
from .typing import Literal, PlatformName, assert_never
PRETTY_NAMES = {'linux': 'Linux', 'macos': 'macOS', 'windows': 'Windows'}
PRETTY_NAMES = {"linux": "Linux", "macos": "macOS", "windows": "Windows"}
@functools.total_ordering
@@ -14,65 +14,65 @@ class Architecture(Enum):
value: str
# mac/linux archs
x86_64 = 'x86_64'
x86_64 = "x86_64"
# linux archs
i686 = 'i686'
aarch64 = 'aarch64'
ppc64le = 'ppc64le'
s390x = 's390x'
i686 = "i686"
aarch64 = "aarch64"
ppc64le = "ppc64le"
s390x = "s390x"
# mac archs
universal2 = 'universal2'
arm64 = 'arm64'
universal2 = "universal2"
arm64 = "arm64"
# windows archs
x86 = 'x86'
AMD64 = 'AMD64'
x86 = "x86"
AMD64 = "AMD64"
# Allow this to be sorted
def __lt__(self, other: "Architecture") -> bool:
return self.value < other.value
@staticmethod
def parse_config(config: str, platform: PlatformName) -> 'Set[Architecture]':
def parse_config(config: str, platform: PlatformName) -> "Set[Architecture]":
result = set()
for arch_str in re.split(r'[\s,]+', config):
if arch_str == 'auto':
for arch_str in re.split(r"[\s,]+", config):
if arch_str == "auto":
result |= Architecture.auto_archs(platform=platform)
elif arch_str == 'native':
elif arch_str == "native":
result.add(Architecture(platform_module.machine()))
elif arch_str == 'all':
elif arch_str == "all":
result |= Architecture.all_archs(platform=platform)
elif arch_str == 'auto64':
elif arch_str == "auto64":
result |= Architecture.bitness_archs(platform=platform, bitness="64")
elif arch_str == 'auto32':
elif arch_str == "auto32":
result |= Architecture.bitness_archs(platform=platform, bitness="32")
else:
result.add(Architecture(arch_str))
return result
@staticmethod
def auto_archs(platform: PlatformName) -> 'Set[Architecture]':
def auto_archs(platform: PlatformName) -> "Set[Architecture]":
native_architecture = Architecture(platform_module.machine())
result = {native_architecture}
if platform == 'linux' and native_architecture == Architecture.x86_64:
if platform == "linux" and native_architecture == Architecture.x86_64:
# x86_64 machines can run i686 docker containers
result.add(Architecture.i686)
if platform == 'windows' and native_architecture == Architecture.AMD64:
if platform == "windows" and native_architecture == Architecture.AMD64:
result.add(Architecture.x86)
if platform == 'macos' and native_architecture == Architecture.arm64:
if platform == "macos" and native_architecture == Architecture.arm64:
# arm64 can build and test both archs of a universal2 wheel.
result.add(Architecture.universal2)
return result
@staticmethod
def all_archs(platform: PlatformName) -> 'Set[Architecture]':
if platform == 'linux':
def all_archs(platform: PlatformName) -> "Set[Architecture]":
if platform == "linux":
return {
Architecture.x86_64,
Architecture.i686,
@@ -80,21 +80,21 @@ class Architecture(Enum):
Architecture.ppc64le,
Architecture.s390x,
}
elif platform == 'macos':
elif platform == "macos":
return {Architecture.x86_64, Architecture.arm64, Architecture.universal2}
elif platform == 'windows':
elif platform == "windows":
return {Architecture.x86, Architecture.AMD64}
else:
assert_never(platform)
@staticmethod
def bitness_archs(platform: PlatformName, bitness: Literal['64', '32']) -> 'Set[Architecture]':
def bitness_archs(platform: PlatformName, bitness: Literal["64", "32"]) -> "Set[Architecture]":
archs_32 = {Architecture.i686, Architecture.x86}
auto_archs = Architecture.auto_archs(platform)
if bitness == '64':
if bitness == "64":
return auto_archs - archs_32
elif bitness == '32':
elif bitness == "32":
return auto_archs & archs_32
else:
assert_never(bitness)
@@ -107,15 +107,15 @@ def allowed_architectures_check(
allowed_architectures = Architecture.all_archs(platform)
msg = f'{PRETTY_NAMES[platform]} only supports {sorted(allowed_architectures)} at the moment.'
msg = f"{PRETTY_NAMES[platform]} only supports {sorted(allowed_architectures)} at the moment."
if platform != 'linux':
msg += ' If you want to set emulation architectures on Linux, use CIBW_ARCHS_LINUX instead.'
if platform != "linux":
msg += " If you want to set emulation architectures on Linux, use CIBW_ARCHS_LINUX instead."
if not architectures <= allowed_architectures:
msg = f'Invalid archs option {architectures}. ' + msg
msg = f"Invalid archs option {architectures}. " + msg
raise ValueError(msg)
if not architectures:
msg = 'Empty archs option set. ' + msg
msg = "Empty archs option set. " + msg
raise ValueError(msg)