diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2022-06-27 19:52:27 +0200 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2022-06-28 09:03:41 +0000 |
| commit | d8e9b867560dafe1baa75356dbb65a177c74b6d2 (patch) | |
| tree | 84aff1e4dbb76e723eb867f8f47a6ca06d008650 | |
| parent | 374c6525c167eafe94b324910d098308126cecf9 (diff) | |
build: fix flake8 warnings and missing f-strings
Pick-to: 6.2 6.3
Change-Id: Ibd2a6088f6a2826be38a13037fe2db6656630b34
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | build_scripts/config.py | 2 | ||||
| -rw-r--r-- | build_scripts/main.py | 5 | ||||
| -rw-r--r-- | build_scripts/platforms/linux.py | 2 | ||||
| -rw-r--r-- | build_scripts/platforms/macos.py | 2 | ||||
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 4 | ||||
| -rw-r--r-- | build_scripts/setup_runner.py | 6 | ||||
| -rw-r--r-- | build_scripts/utils.py | 4 |
7 files changed, 13 insertions, 12 deletions
diff --git a/build_scripts/config.py b/build_scripts/config.py index 30418922a..89e6d7574 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -240,7 +240,7 @@ class Config(object): content += readme if changes: - content += "\n\n" + changes + content += f"\n\n{changes}" return content diff --git a/build_scripts/main.py b/build_scripts/main.py index 498dd1536..e1eae52c4 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -24,7 +24,7 @@ from setuptools.command.build_py import build_py as _build_py from setuptools.command.develop import develop as _develop from setuptools.command.install import install as _install from setuptools.command.install_lib import install_lib as _install_lib -from setuptools.command.install_scripts import install_scripts # preload only +from setuptools.command.install_scripts import install_scripts # noqa: preload only # Use the distutils implementation within setuptools (but not before) from setuptools._distutils import log @@ -117,6 +117,7 @@ def get_make(platform_arch, build_type): _allowed_versions_cache = None + def get_allowed_python_versions(): global _allowed_versions_cache if _allowed_versions_cache is not None: @@ -944,7 +945,7 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin): raise def qt_is_framework_build(self): - if os.path.isdir(self.qtinfo.headers_dir + "/../lib/QtCore.framework"): + if os.path.isdir(f"{self.qtinfo.headers_dir}/../lib/QtCore.framework"): return True return False diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index 471e593cd..6d12b3c39 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -32,7 +32,7 @@ def prepare_standalone_package_linux(self, vars): accepted_modules = ['libQt6*.so.?'] if constrain_modules: - accepted_modules = ["libQt6" + module + "*.so.?" for module in constrain_modules] + accepted_modules = [f"libQt6{module}*.so.?" for module in constrain_modules] accepted_modules.append("libicu*.so.??") copydir("{qt_lib_dir}", destination_lib_dir, diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py index e4cd5480b..cab8de259 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -117,7 +117,7 @@ def prepare_standalone_package_macos(self, vars): ignored_modules.extend(['libQt6WebEngine*.dylib']) accepted_modules = ['libQt6*.6.dylib'] if constrain_modules: - accepted_modules = ["libQt6" + module + "*.6.dylib" for module in constrain_modules] + accepted_modules = [f"libQt6{module}*.6.dylib" for module in constrain_modules] copydir("{qt_lib_dir}", "{st_build_dir}/{st_package_name}/Qt/lib", diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index 650dff13c..92a0d080b 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -318,9 +318,9 @@ def copy_qt_artifacts(self, copy_pdbs, vars): # <qt>/bin/*.dll and Qt *.pdbs -> <setup>/{st_package_name} part two # File filter to copy only debug or only release files. if constrain_modules: - qt_dll_patterns = ["Qt6" + x + "{}.dll" for x in constrain_modules] + qt_dll_patterns = [f"Qt6{x}{{}}.dll" for x in constrain_modules] if copy_pdbs: - qt_dll_patterns += ["Qt6" + x + "{}.pdb" for x in constrain_modules] + qt_dll_patterns += [f"Qt6{x}{{}}.pdb" for x in constrain_modules] else: qt_dll_patterns = ["Qt6*{}.dll", "lib*{}.dll"] if copy_pdbs: diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py index ff98fb862..3be0fd407 100644 --- a/build_scripts/setup_runner.py +++ b/build_scripts/setup_runner.py @@ -30,13 +30,13 @@ class SetupRunner(object): @staticmethod def cmd_line_argument_is_in_args(argument, args): """ Check if command line argument was passed in args. """ - return any(arg for arg in list(args) if "--" + argument in arg) + return any(arg for arg in list(args) if f"--{argument}" in arg) @staticmethod def get_cmd_line_argument_in_args(argument, args): """ Gets the value of a cmd line argument passed in args. """ for arg in list(args): - if "--" + argument in arg: + if f"--{argument}" in arg: prefix = f"--{argument}" prefix_len = len(prefix) + 1 return arg[prefix_len:] @@ -45,7 +45,7 @@ class SetupRunner(object): @staticmethod def remove_cmd_line_argument_in_args(argument, args): """ Remove command line argument from args. """ - return [arg for arg in list(args) if "--" + argument not in arg] + return [arg for arg in list(args) if f"--{argument}" not in arg] @staticmethod def construct_cmd_line_argument(name, value=None): diff --git a/build_scripts/utils.py b/build_scripts/utils.py index a99ef073b..0c69ba87c 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -136,11 +136,11 @@ def find_vcdir(version): # trying Express edition if productdir is None: try: - hasattr(msvc9, VSEXPRESS_BASE) + hasattr(msvc9, VSEXPRESS_BASE) # noqa: VSEXPRESS_BASE get defined with msvc9 except AttributeError: pass else: - vsbase = VSEXPRESS_BASE % version + vsbase = VSEXPRESS_BASE % version # noqa: VSEXPRESS_BASE get defined with msvc9 try: productdir = msvc9.Reg.get_value(rf"{vsbase}\Setup\VC", "productdir") except KeyError: |