diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2022-03-18 11:49:03 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2022-03-22 14:27:19 +0000 |
| commit | a10efb90f048764527c1d26bc0362c6db8f4234e (patch) | |
| tree | cb486768c8a6161f091bec2badb21c03b6539458 /build_scripts/main.py | |
| parent | 6f20389eecdd3148b44ede8cd179d324ba79cb4f (diff) | |
flake8: improve codestyling of build scripts
- Fixing f-strings
- Fixing indentation of some lines
- Removing unused variables and imports
- Changing the way of verifying if sphinx is installed
Change-Id: I3f361759682324c9b0c9d33c24583435f137f05a
Pick-to: 6.2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_scripts/main.py')
| -rw-r--r-- | build_scripts/main.py | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index 39ee4837e..e50ca791e 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -43,6 +43,7 @@ import os import platform import re import sys +import importlib from textwrap import dedent import time from .config import config @@ -67,7 +68,6 @@ from setuptools.command.build_py import build_py as _build_py # happens only with custom builds of Python without virtual environment. import setuptools.command.install_scripts -from sysconfig import get_config_var # Use the distutils implementation within setuptools from setuptools._distutils.errors import DistutilsSetupError from setuptools._distutils import log @@ -763,7 +763,7 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin): if self.is_cross_compile and (not OPTION["SHIBOKEN_HOST_PATH"] or not os.path.exists(OPTION["SHIBOKEN_HOST_PATH"])): raise DistutilsSetupError( - f"Please specify the location of host shiboken tools via --shiboken-host-path=") + "Please specify the location of host shiboken tools via --shiboken-host-path=") if self.shiboken_host_path: cmake_cmd.append(f"-DQFP_SHIBOKEN_HOST_PATH={self.shiboken_host_path}") @@ -803,10 +803,8 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin): if not OPTION["SKIP_DOCS"]: if extension.lower() == SHIBOKEN: - try: - # Check if sphinx is installed to proceed. - import sphinx - + found = importlib.util.find_spec("sphinx") + if found: log.info("Generating Shiboken documentation") make_doc_cmd = [self.make_path, "doc"] if OPTION["VERBOSE_BUILD"] and self.make_generator == "Ninja": @@ -814,7 +812,7 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin): if run_process(make_doc_cmd) != 0: raise DistutilsSetupError("Error generating documentation " f"for {extension}") - except ImportError: + else: log.info("Sphinx not found, skipping documentation build") else: log.info("Skipped documentation generation") @@ -1105,7 +1103,7 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin): if not (self.is_cross_compile and sys.platform.startswith('linux') and self.standalone): return - log.info(f"Patching rpath for Qt and QML plugins.") + log.info("Patching rpath for Qt and QML plugins.") for plugin in plugin_paths: if os.path.isdir(plugin) or os.path.islink(plugin): continue @@ -1164,16 +1162,16 @@ class PysideRstDocs(Command, DistUtilsCommandMixin): self.doc_dir = os.path.join(config.setup_script_dir, "sources") self.doc_dir = os.path.join(self.doc_dir, self.name) self.doc_dir = os.path.join(self.doc_dir, "doc") - try: - # Check if sphinx is installed to proceed. - import sphinx + # Check if sphinx is installed to proceed. + found = importlib.util.find_spec("sphinx") + if found: if self.name == SHIBOKEN: log.info("-- Generating Shiboken documentation") log.info(f"-- Documentation directory: 'html/{PYSIDE}/{SHIBOKEN}/'") elif self.name == PYSIDE: log.info("-- Generating PySide documentation") log.info(f"-- Documentation directory: 'html/{PYSIDE}/'") - except ImportError: + else: raise DistutilsSetupError("Sphinx not found - aborting") self.html_dir = "html" @@ -1198,8 +1196,8 @@ class PysideRstDocs(Command, DistUtilsCommandMixin): def run(self): if not self.skip: - cmake_cmd = [OPTION["CMAKE"]] - cmake_cmd += [ + cmake_cmd = [ + OPTION["CMAKE"], "-S", self.doc_dir, "-B", self.out_dir, "-DDOC_OUTPUT_FORMAT=html", |