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

Fix small oversights

Browse Source
This commit is contained in:
Matthew Treinish
2020-02-20 16:17:51 -05:00
parent ec4ea4e011
commit a83ac06c8d
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/linux.py
+6 -5
View File
@@ -48,19 +48,20 @@ def get_python_configurations(build_selector):
for c in python_configurations: for c in python_configurations:
if not build_selector(c.identifier): if not build_selector(c.identifier):
continue continue
if platform.machine == "x86_64": pm = platform.machine()
if pm == "x86_64":
if c.identifier.endswith('x86_64') or c.identifier.endswith('i686'): if c.identifier.endswith('x86_64') or c.identifier.endswith('i686'):
configurations.append(c) configurations.append(c)
if platform.machine == "i686": if pm == "i686":
if c.identifier.endswith('i686'): if c.identifier.endswith('i686'):
configuration.append(c) configuration.append(c)
elif platform.machine == "aarch64": elif pm == "aarch64":
if c.identifier.endswith('aarch64'): if c.identifier.endswith('aarch64'):
configurations.append(c) configurations.append(c)
elif platform.machine == "ppc64le": elif pm == "ppc64le":
if c.identifier.endswith('ppc64le'): if c.identifier.endswith('ppc64le'):
configurations.append(c) configurations.append(c)
elif platform.machine == "s390x": elif pm == "s390x":
if c.identifier.endswith('s390x'): if c.identifier.endswith('s390x'):
configurations.append(c) configurations.append(c)
test/shared/utils.py
+5 -5
View File
@@ -81,15 +81,14 @@ def expected_wheels(package_name, package_version, manylinux_versions=None,
# {python tag} and {abi tag} are closely related to the python interpreter used to build the wheel # {python tag} and {abi tag} are closely related to the python interpreter used to build the wheel
# so we'll merge them below as python_abi_tag # so we'll merge them below as python_abi_tag
python_abi_tags = ['cp35-cp35m', 'cp36-cp36m', 'cp37-cp37m', 'cp38-cp38'] python_abi_tags = ['cp35-cp35m', 'cp36-cp36m', 'cp37-cp37m', 'cp38-cp38']
extra_python_abi_tags = ['cp27-cp27m', 'pp27-pypy_73', 'pp36-pypy36_pp73'] extra_python_abi_tags = ['cp27-cp27m', 'pp27-pypy_73', 'pp36-pypy36_pp73']
if platform == 'linux': if platform == 'linux':
if pm.machine not in ['x86_64', 'i686']: if pm.machine() not in ['x86_64', 'i686']:
if manylinux_versions is None: if manylinux_versions is None:
manylinux_versions = ['manylinux2014'] manylinux_versions = ['manylinux2014']
architectures = {'cp': [pm.machine]} architectures = {'cp': [pm.machine()]}
else: else:
if manylinux_versions is None: if manylinux_versions is None:
manylinux_versions = ['manylinux1', 'manylinux2010'] manylinux_versions = ['manylinux1', 'manylinux2010']
@@ -108,14 +107,15 @@ def expected_wheels(package_name, package_version, manylinux_versions=None,
def get_platform_tags(python_abi_tag): def get_platform_tags(python_abi_tag):
return platform_tags[python_abi_tag[:2]] return platform_tags[python_abi_tag[:2]]
elif platform == 'windows': elif platform == 'windows':
python_api_tag += extra_python_abi_tags python_abi_tags += extra_python_abi_tags
platform_tags = {'cp': ['win32', 'win_amd64'], 'pp': ['win32']} platform_tags = {'cp': ['win32', 'win_amd64'], 'pp': ['win32']}
def get_platform_tags(python_abi_tag): def get_platform_tags(python_abi_tag):
return platform_tags[python_abi_tag[:2]] return platform_tags[python_abi_tag[:2]]
elif platform == 'macos': elif platform == 'macos':
python_api_tag += extra_python_abi_tags python_abi_tags += extra_python_abi_tags
def get_platform_tags(python_abi_tag): def get_platform_tags(python_abi_tag):
default_version = '10.7' if python_abi_tag.startswith('pp') else '10.9' default_version = '10.7' if python_abi_tag.startswith('pp') else '10.9'
return ['macosx_{}_x86_64'.format((macosx_deployment_target or default_version).replace('.', '_'))] return ['macosx_{}_x86_64'.format((macosx_deployment_target or default_version).replace('.', '_'))]