From ddd02e6743740846afc4e8326deaba0a266c7b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 10 Jul 2018 14:20:57 +0300 Subject: Include manylinux1 in package name for python2 builds on Linux Change-Id: I777cf3bd4f060610782fe6a09acd0e10ef713f0b Reviewed-by: Alexandru Croitor --- build_scripts/wheel_override.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/build_scripts/wheel_override.py b/build_scripts/wheel_override.py index 838de1af1..3a5c8164b 100644 --- a/build_scripts/wheel_override.py +++ b/build_scripts/wheel_override.py @@ -136,7 +136,7 @@ class PysideBuildWheel(_bdist_wheel): # TODO: Add actual distro detection, instead of # relying on limited_api option. if plat_name in ('linux-x86_64', 'linux_x86_64') and sys.maxsize > 2147483647 \ - and self.py_limited_api: + and (self.py_limited_api or sys.version_info[0] == 2): plat_name = 'manylinux1_x86_64' plat_name = plat_name.replace('-', '_').replace('.', '_') @@ -160,10 +160,11 @@ class PysideBuildWheel(_bdist_wheel): supported_tags = pep425tags.get_supported( supplied_platform=plat_name if self.plat_name_supplied else None) # XXX switch to this alternate implementation for non-pure: - if not self.py_limited_api: - assert tag == supported_tags[0], "%s != %s" % (tag, supported_tags[0]) - assert tag in supported_tags, ( - "would build wheel with unsupported tag {}".format(tag)) + if (self.py_limited_api) or (plat_name in ('manylinux1_x86_64') and sys.version_info[0] == 2): + return tag + assert tag == supported_tags[0], "%s != %s" % (tag, supported_tags[0]) + assert tag in supported_tags, ( + "would build wheel with unsupported tag {}".format(tag)) return tag # Copy of get_tag from bdist_wheel.py, to write a triplet Tag @@ -179,13 +180,14 @@ class PysideBuildWheel(_bdist_wheel): # Doesn't work for bdist_wininst impl_tag, abi_tag, plat_tag = self.get_tag() - limited_api_enabled = OPTION_LIMITED_API and sys.version_info[0] >= 3 + # To enable pypi upload we are adjusting the wheel name + pypi_ready = (OPTION_LIMITED_API and sys.version_info[0] >= 3) or (sys.version_info[0] == 2) def writeTag(impl): for abi in abi_tag.split('.'): for plat in plat_tag.split('.'): msg['Tag'] = '-'.join((impl, abi, plat)) - if limited_api_enabled: + if pypi_ready: writeTag(impl_tag) else: for impl in impl_tag.split('.'): -- cgit v1.2.3