diff options
| -rw-r--r-- | build_scripts/build_info_collector.py | 3 | ||||
| -rw-r--r-- | build_scripts/main.py | 8 | ||||
| -rw-r--r-- | build_scripts/utils.py | 10 | ||||
| -rw-r--r-- | build_scripts/wheel_override.py | 9 |
4 files changed, 13 insertions, 17 deletions
diff --git a/build_scripts/build_info_collector.py b/build_scripts/build_info_collector.py index 024a874bb..9310c0552 100644 --- a/build_scripts/build_info_collector.py +++ b/build_scripts/build_info_collector.py @@ -182,7 +182,8 @@ class BuildInfoCollectorMixin(object): self.py_arch = platform_arch[:-3] py_executable = sys.executable - py_version = f"{sys.version_info[0]}.{sys.version_info[1]}" + _major, _minor, *_ = sys.version_info + py_version = f"{_major}.{_minor}" py_include_dir = get_config_var("INCLUDEPY") py_libdir = get_config_var("LIBDIR") # distutils.sysconfig.get_config_var('prefix') returned the diff --git a/build_scripts/main.py b/build_scripts/main.py index 88bae4e3c..806a957e4 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -349,11 +349,11 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin): # Revisit once Clang is bundled with Qt. if (sys.platform == "win32" and parse_version(self.qtinfo.version) >= parse_version("5.7.0")): - clang_dir = detect_clang() - if clang_dir[0]: - clangBinDir = os.path.join(clang_dir[0], 'bin') + clang_dir, clang_source = detect_clang() + if clang_dir: + clangBinDir = os.path.join(clang_dir, 'bin') if clangBinDir not in os.environ.get('PATH'): - log.info(f"Adding {clangBinDir} as detected by {clang_dir[1]} to PATH") + log.info(f"Adding {clangBinDir} as detected by {clang_source} to PATH") additional_paths.append(clangBinDir) else: raise DistutilsSetupError("Failed to detect Clang when checking " diff --git a/build_scripts/utils.py b/build_scripts/utils.py index a1b37c93a..fd9b8f71d 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -366,7 +366,8 @@ def make_file_writable_by_owner(path): def remove_tree(dirname, ignore=False): def handle_remove_readonly(func, path, exc): - excvalue = exc[1] + # exc returns like 'sys.exc_info()': type, value, traceback + _, excvalue, _ = exc if func in (os.rmdir, os.remove) and excvalue.errno == errno.EACCES: os.chmod(path, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) # 0777 func(path) @@ -1223,14 +1224,9 @@ def parse_cmake_conf_assignments_by_key(source_dir): values. """ - d = {} contents = (Path(source_dir) / ".cmake.conf").read_text() matches = re.findall(r'set\((.+?) "(.*?)"\)', contents) - for m in matches: - key = m[0] - value = m[1] - if key and value: - d[key] = value + d = {key: value for key, value in matches} return d diff --git a/build_scripts/wheel_override.py b/build_scripts/wheel_override.py index 8dcf82baf..0a359c08e 100644 --- a/build_scripts/wheel_override.py +++ b/build_scripts/wheel_override.py @@ -96,16 +96,14 @@ class PysideBuildWheel(_bdist_wheel, DistUtilsCommandMixin): impl = 'no-py-ver-impl-available' abi = 'no-abi-tag-info-available' py_version = python_target_info['version'].split('.') - py_version_major = py_version[0] - py_version_minor = py_version[1] + py_version_major, py_version_minor, _ = py_version so_abi = python_target_info['so_abi'] if so_abi and so_abi.startswith('cpython-'): - interpreter_name = so_abi.split('-')[0] + interpreter_name, cp_version = so_abi.split('-') impl_name = tags.INTERPRETER_SHORT_NAMES.get(interpreter_name) or interpreter_name impl_ver = f"{py_version_major}{py_version_minor}" impl = impl_name + impl_ver - cp_version = so_abi.split("-")[1] abi = f'cp{cp_version}' tag_tuple = (impl, abi, plat_name) return tag_tuple @@ -151,7 +149,8 @@ class PysideBuildWheel(_bdist_wheel, DistUtilsCommandMixin): if (old_plat_name in ('linux-x86_64', 'linux_x86_64') and is_64bit() and self.py_limited_api): - glibc = platform.libc_ver()[1].replace(".", "_") + _, _version = platform.libc_ver() + glibc = _version.replace(".", "_") tag = (old_impl, old_abi_tag, f"manylinux_{glibc}_x86_64") # Set manylinux tag for cross-compiled builds when targeting |