diff options
author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-10-14 10:42:59 +0200 |
---|---|---|
committer | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-10-14 12:05:49 +0200 |
commit | 93ae00636551b84ebda8df208f064e132f1c8b5c (patch) | |
tree | 2af57837ae4cde8bf7a2e6b9f870620fce489525 | |
parent | ff5a96c49e2aa5347c1c9892aad33c591e931639 (diff) |
Fix wheel_override error when wheel not available
Since the try failed, there was no option to import DistUtilsCommandMixin
and then a:
NameError: name 'DistUtilsCommandMixin' is not defined
and
AttributeError: type object 'type' has no attribute 'user_options'
was raised.
Task-number: PYSIDE-807
Change-Id: If5aa37ce9928a5c029b21decc24bd2bccf9b4dc4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | build_scripts/wheel_override.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/build_scripts/wheel_override.py b/build_scripts/wheel_override.py index 061094d9b..20e6f942c 100644 --- a/build_scripts/wheel_override.py +++ b/build_scripts/wheel_override.py @@ -40,22 +40,22 @@ wheel_module_exists = False +import os +import sys +from .options import DistUtilsCommandMixin, OPTION +from distutils import log as logger +from email.generator import Generator +from .wheel_utils import get_package_version, get_qt_version, macos_plat_name + try: - import os - import sys - from distutils import log as logger from wheel import pep425tags from wheel.bdist_wheel import bdist_wheel as _bdist_wheel from wheel.bdist_wheel import safer_name as _safer_name from wheel.pep425tags import get_abbr_impl, get_impl_ver, get_abi_tag from wheel.pep425tags import get_platform as wheel_get_platform - from email.generator import Generator from wheel import __version__ as wheel_version - from .options import DistUtilsCommandMixin, OPTION - from .wheel_utils import get_package_version, get_qt_version, macos_plat_name - wheel_module_exists = True except Exception as e: _bdist_wheel, wheel_version = type, '' # dummy to make class statement happy @@ -69,7 +69,8 @@ def get_bdist_wheel_override(): class PysideBuildWheel(_bdist_wheel, DistUtilsCommandMixin): - user_options = _bdist_wheel.user_options + DistUtilsCommandMixin.mixin_user_options + user_options = (_bdist_wheel.user_options + DistUtilsCommandMixin.mixin_user_options + if wheel_module_exists else None) def __init__(self, *args, **kwargs): self._package_version = None |