PyQt-builder 1.18.2__tar.gz → 1.19.0__tar.gz

{pyqt_builder-1.18.2 → pyqt_builder-1.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyQt-builder
-Version: 1.18.2
+Version: 1.19.0
 Summary: The PyQt build system
 Author-email: Phil Thompson <phil@riverbankcomputing.com>
 License-Expression: BSD-2-Clause

{pyqt_builder-1.18.2 → pyqt_builder-1.19.0}/PyQt_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyQt-builder
-Version: 1.18.2
+Version: 1.19.0
 Summary: The PyQt build system
 Author-email: Phil Thompson <phil@riverbankcomputing.com>
 License-Expression: BSD-2-Clause

{pyqt_builder-1.18.2 → pyqt_builder-1.19.0}/pyqtbuild/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.18.2'
-__version_tuple__ = version_tuple = (1, 18, 2)
+__version__ = version = '1.19.0'
+__version_tuple__ = version_tuple = (1, 19, 0)
+
+__commit_id__ = commit_id = 'g2c1ca1c73'

{pyqt_builder-1.18.2 → pyqt_builder-1.19.0}/pyqtbuild/builder.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
-# Copyright (c) 2024 Phil Thompson <phil@riverbankcomputing.com>
+# Copyright (c) 2025 Phil Thompson <phil@riverbankcomputing.com>
 
 
 import os
@@ -103,9 +103,13 @@ class QmakeBuilder(Builder):
                 if self.qt_version >= 0x060000:
                     from platform import processor
 
-                    # The arm64 build is based on Ubuntu 24.04 specifically.
                     if processor() == 'aarch64':
+                        # The arm64 build is based on Ubuntu 24.04.
                         project.minimum_glibc_version = '2.39'
+                    elif self.qt_version >= 0x060a00:
+                        # The Qt v6.10 installer seems to be based on Ubuntu
+                        # 22.04 or similar.
+                        project.minimum_glibc_version = '2.34'
                     else:
                         project.minimum_glibc_version = '2.28'
                 else:

{pyqt_builder-1.18.2 → pyqt_builder-1.19.0}/pyqtbuild/bundle/bundle.py

@@ -10,6 +10,7 @@ import shutil
 from sipbuild import UserException
 
 from . import packages
+from .abstract_package import AbstractPackage
 from .verbose import verbose
 from .wheel import create_wheel, unpack_wheel, write_record_file
 
@@ -50,15 +51,23 @@ def bundle(wheel_path, qt_dir, build_tag_suffix, msvc_runtime, openssl,
                     "'{0}' is not supported by {1}".format(arch, wheel_name))
 
     # Get the package object.
-    sub_parts = parts[0].split('_')
-    if sub_parts[-1] == 'commercial':
-        sub_parts.pop()
+    package_title = parts[0]
+    if package_title.endswith('_commercial'):
+        package_title = package_title[:-11]
 
-    package_name = '_'.join(sub_parts)
-    package_title = package_name.replace('_', '-')
-    package_factory = packages.__dict__.get(package_name)
+    package_name = package_title.lower()
 
-    if package_factory is None:
+    # Look for the factory corresponding to the normalised package name.
+    for key, value in packages.__dict__.items():
+        # This is the name of an intermediate class so explicity exclude it.
+        # It can only happen if the user has been changing the wheel names.
+        if key == 'PyQt':
+            continue
+
+        if key.lower() == package_name and isinstance(value, type) and issubclass(value, AbstractPackage):
+            package_factory = value
+            break
+    else:
         raise UserException(
                 "'{0}' is not a supported package".format(package_title))
 

{pyqt_builder-1.18.2 → pyqt_builder-1.19.0}/pyqtbuild/bundle/qt_wheel.py

@@ -47,7 +47,9 @@ def qt_wheel(package, qt_dir, build_tag, suffix, msvc_runtime, openssl,
         else:
             wheel_arch = 'x86_64'
 
-            if package.qt_version >= (6, 0, 0):
+            if package.qt_version >= (6, 10, 0):
+                manylinux = '_2_34'
+            elif package.qt_version >= (6, 0, 0):
                 manylinux = '_2_28'
             else:
                 manylinux = '2014'