diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-05 09:51:17 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-06 16:54:16 +0200 |
| commit | c8e6baea6015cb687fc049a90caa3866476bbe5e (patch) | |
| tree | 754338108dfdd6ac0e549f3953e7561796327748 /build_scripts/wheel_override.py | |
| parent | e23d2a54b02dc31f980bfeaff463706c7fef782a (diff) | |
setup.py: Remove constructor parameters depending on options from PysideBuildWheel
Constructor parameters depending on option values create a problem
for introducing per-command option parsing.
To fix this, split utility functions used by the commands
in main.py and PysideBuildWheel into a separate wheel_utils.py
Task-number: PYSIDE-807
Change-Id: Idabd3ba03726d2284e80234fc8485b70e6eb20ca
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts/wheel_override.py')
| -rw-r--r-- | build_scripts/wheel_override.py | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/build_scripts/wheel_override.py b/build_scripts/wheel_override.py index 0a3cb0dbf..e4147a5bc 100644 --- a/build_scripts/wheel_override.py +++ b/build_scripts/wheel_override.py @@ -54,6 +54,7 @@ try: 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: @@ -62,20 +63,13 @@ except Exception as e: 'Skipping wheel overriding.'.format(e)) -def get_bdist_wheel_override(params): - if wheel_module_exists: - class PysideBuildWheelDecorated(PysideBuildWheel): - def __init__(self, *args, **kwargs): - self.params = params - PysideBuildWheel.__init__(self, *args, **kwargs) - return PysideBuildWheelDecorated - else: - return None +def get_bdist_wheel_override(): + return PysideBuildWheel if wheel_module_exists else None class PysideBuildWheel(_bdist_wheel): def __init__(self, *args, **kwargs): - self.pyside_params = None + self._package_version = None _bdist_wheel.__init__(self, *args, **kwargs) def finalize_options(self): @@ -83,7 +77,7 @@ class PysideBuildWheel(_bdist_wheel): # Override the platform name to contain the correct # minimum deployment target. # This is used in the final wheel name. - self.plat_name = self.params['macos_plat_name'] + self.plat_name = macos_plat_name() # When limited API is requested, notify bdist_wheel to # create a properly named package. @@ -92,6 +86,8 @@ class PysideBuildWheel(_bdist_wheel): if limited_api_enabled: self.py_limited_api = "cp35.cp36.cp37.cp38.cp39" + self._package_version = get_package_version() + _bdist_wheel.finalize_options(self) @property @@ -102,9 +98,7 @@ class PysideBuildWheel(_bdist_wheel): # PySide2-5.6-5.6.4-cp27-cp27m-macosx_10_10_intel.whl # The PySide2 version is "5.6". # The Qt version built against is "5.6.4". - qt_version = self.params['qt_version'] - package_version = self.params['package_version'] - wheel_version = "{}-{}".format(package_version, qt_version) + wheel_version = "{}-{}".format(self._package_version, get_qt_version()) components = (_safer_name(self.distribution.get_name()), wheel_version) if self.build_number: components += (self.build_number,) |