diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-14 20:34:46 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-14 20:34:46 +0200 |
| commit | 68ec9c643abf30cf22b9932ec82098cdebc08b98 (patch) | |
| tree | 18e6db70e971b3e437145183d07ed017933ab64d /build_scripts/wheel_override.py | |
| parent | 30724622333ffc8bce61f7e19217977eebbf9564 (diff) | |
| parent | b0da5a06e147b02af0bf2d69364e3bfcc04327d5 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I46f5d2dc758d0e1f23377c91ba7496793461771e
Diffstat (limited to 'build_scripts/wheel_override.py')
| -rw-r--r-- | build_scripts/wheel_override.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/build_scripts/wheel_override.py b/build_scripts/wheel_override.py index e4147a5bc..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 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 @@ -67,12 +67,18 @@ def get_bdist_wheel_override(): return PysideBuildWheel if wheel_module_exists else None -class PysideBuildWheel(_bdist_wheel): +class PysideBuildWheel(_bdist_wheel, DistUtilsCommandMixin): + + 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 _bdist_wheel.__init__(self, *args, **kwargs) + DistUtilsCommandMixin.__init__(self) def finalize_options(self): + DistUtilsCommandMixin.mixin_finalize_options(self) if sys.platform == 'darwin': # Override the platform name to contain the correct # minimum deployment target. |