diff options
| author | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2019-11-17 14:51:29 +0100 |
|---|---|---|
| committer | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2019-12-03 20:39:09 +0100 |
| commit | 3ce80d312f5da83d97674aff57e238e7a621ccb8 (patch) | |
| tree | 00a6f93185ea4cbcdcfe2a0b3688f4fa39ed0603 /build_scripts/setup_runner.py | |
| parent | d4764a4c514ec15f4cd680143cbd189482af6251 (diff) | |
Replace OPTION_* by a dictionary
Currently we are importing * from the options.py file,
which is a problem for the linters to discover if we are properly
using the options of the file.
Having a dictionary provides also a better way of access these options,
and it is more clean than having one variable per each option.
Change-Id: Ie70bd88665357b85e2842c5df269857504ecccdf
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'build_scripts/setup_runner.py')
| -rw-r--r-- | build_scripts/setup_runner.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py index 522d053a2..1a7317e4d 100644 --- a/build_scripts/setup_runner.py +++ b/build_scripts/setup_runner.py @@ -44,8 +44,7 @@ import textwrap from build_scripts.config import config from build_scripts.main import get_package_version, get_setuptools_extension_modules from build_scripts.main import cmd_class_dict -from build_scripts.options import OPTION_BUILD_TYPE, OPTION_INTERNAL_BUILD_TYPE -from build_scripts.options import OPTION_QUIET +from build_scripts.options import OPTION from build_scripts.utils import run_process from setuptools import setup @@ -103,13 +102,13 @@ class SetupRunner(object): """ # Prepare initial config. - config.init_config(build_type=OPTION_BUILD_TYPE, - internal_build_type=OPTION_INTERNAL_BUILD_TYPE, + config.init_config(build_type=OPTION["BUILD_TYPE"], + internal_build_type=OPTION["INTERNAL_BUILD_TYPE"], cmd_class_dict=cmd_class_dict, package_version=get_package_version(), ext_modules=get_setuptools_extension_modules(), setup_script_dir=self.setup_script_dir, - quiet=OPTION_QUIET) + quiet=OPTION["QUIET"]) # This is an internal invocation of setup.py, so start actual # build. |