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

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

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: PyQt-builder
-Version: 1.19.0
+Version: 1.20.0
 Summary: The PyQt build system
 Author-email: Phil Thompson <phil@riverbankcomputing.com>
 License-Expression: BSD-2-Clause
 Project-URL: homepage, https://github.com/Python-PyQt/PyQt-builder
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: packaging

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

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: PyQt-builder
-Version: 1.19.0
+Version: 1.20.0
 Summary: The PyQt build system
 Author-email: Phil Thompson <phil@riverbankcomputing.com>
 License-Expression: BSD-2-Clause
 Project-URL: homepage, https://github.com/Python-PyQt/PyQt-builder
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: packaging

{pyqt_builder-1.19.0 → pyqt_builder-1.20.0}/PyQt_builder.egg-info/SOURCES.txt

@@ -7,6 +7,8 @@ PyQt_builder.egg-info/SOURCES.txt
 PyQt_builder.egg-info/dependency_links.txt
 PyQt_builder.egg-info/entry_points.txt
 PyQt_builder.egg-info/requires.txt
+PyQt_builder.egg-info/scm_file_list.json
+PyQt_builder.egg-info/scm_version.json
 PyQt_builder.egg-info/top_level.txt
 pyqtbuild/__init__.py
 pyqtbuild/_version.py
@@ -28,13 +30,31 @@ pyqtbuild/bundle/dlls/msvc-32/concrt140.dll
 pyqtbuild/bundle/dlls/msvc-32/msvcp140.dll
 pyqtbuild/bundle/dlls/msvc-32/msvcp140_1.dll
 pyqtbuild/bundle/dlls/msvc-32/msvcp140_2.dll
+pyqtbuild/bundle/dlls/msvc-32/msvcp140_atomic_wait.dll
+pyqtbuild/bundle/dlls/msvc-32/msvcp140_codecvt_ids.dll
+pyqtbuild/bundle/dlls/msvc-32/vccorlib140.dll
 pyqtbuild/bundle/dlls/msvc-32/vcruntime140.dll
+pyqtbuild/bundle/dlls/msvc-32/vcruntime140_threads.dll
 pyqtbuild/bundle/dlls/msvc-64/concrt140.dll
 pyqtbuild/bundle/dlls/msvc-64/msvcp140.dll
 pyqtbuild/bundle/dlls/msvc-64/msvcp140_1.dll
 pyqtbuild/bundle/dlls/msvc-64/msvcp140_2.dll
+pyqtbuild/bundle/dlls/msvc-64/msvcp140_atomic_wait.dll
+pyqtbuild/bundle/dlls/msvc-64/msvcp140_codecvt_ids.dll
+pyqtbuild/bundle/dlls/msvc-64/vccorlib140.dll
 pyqtbuild/bundle/dlls/msvc-64/vcruntime140.dll
 pyqtbuild/bundle/dlls/msvc-64/vcruntime140_1.dll
+pyqtbuild/bundle/dlls/msvc-64/vcruntime140_threads.dll
+pyqtbuild/bundle/dlls/msvc-arm64/concrt140.dll
+pyqtbuild/bundle/dlls/msvc-arm64/msvcp140.dll
+pyqtbuild/bundle/dlls/msvc-arm64/msvcp140_1.dll
+pyqtbuild/bundle/dlls/msvc-arm64/msvcp140_2.dll
+pyqtbuild/bundle/dlls/msvc-arm64/msvcp140_atomic_wait.dll
+pyqtbuild/bundle/dlls/msvc-arm64/msvcp140_codecvt_ids.dll
+pyqtbuild/bundle/dlls/msvc-arm64/vccorlib140.dll
+pyqtbuild/bundle/dlls/msvc-arm64/vcruntime140.dll
+pyqtbuild/bundle/dlls/msvc-arm64/vcruntime140_1.dll
+pyqtbuild/bundle/dlls/msvc-arm64/vcruntime140_threads.dll
 pyqtbuild/bundle/dlls/openssl-32/libcrypto-1_1.dll
 pyqtbuild/bundle/dlls/openssl-32/libssl-1_1.dll
 pyqtbuild/bundle/dlls/openssl-64/libcrypto-1_1-x64.dll
@@ -45,6 +65,7 @@ pyqtbuild/bundle/packages/pyqt3d.py
 pyqtbuild/bundle/packages/pyqt5.py
 pyqtbuild/bundle/packages/pyqt6.py
 pyqtbuild/bundle/packages/pyqt6_3d.py
+pyqtbuild/bundle/packages/pyqt6_canvaspainter.py
 pyqtbuild/bundle/packages/pyqt6_charts.py
 pyqtbuild/bundle/packages/pyqt6_datavisualization.py
 pyqtbuild/bundle/packages/pyqt6_graphs.py

pyqt_builder-1.20.0/PyQt_builder.egg-info/scm_file_list.json

@@ -0,0 +1,93 @@
+{
+  "files": [
+    ".gitignore",
+    ".readthedocs.yaml",
+    "LICENSE",
+    "MANIFEST.in",
+    "README.md",
+    "docs/Makefile",
+    "docs/command_line_tools.rst",
+    "docs/conf.py",
+    "docs/example.rst",
+    "docs/index.rst",
+    "docs/introduction.rst",
+    "docs/make.bat",
+    "docs/pyproject.toml",
+    "docs/pyproject_toml.rst",
+    "docs/pyqtbuild_api.rst",
+    "docs/pyqtbundle.rst",
+    "docs/releases.md",
+    "docs/requirements.in",
+    "docs/requirements.txt",
+    "pyproject.toml",
+    "pyqtbuild/__init__.py",
+    "pyqtbuild/bindings.py",
+    "pyqtbuild/builder.py",
+    "pyqtbuild/bundle/__init__.py",
+    "pyqtbuild/bundle/abstract_package.py",
+    "pyqtbuild/bundle/bundle.py",
+    "pyqtbuild/bundle/bundle_main.py",
+    "pyqtbuild/bundle/dlls/msvc-32/concrt140.dll",
+    "pyqtbuild/bundle/dlls/msvc-32/msvcp140.dll",
+    "pyqtbuild/bundle/dlls/msvc-32/msvcp140_1.dll",
+    "pyqtbuild/bundle/dlls/msvc-32/msvcp140_2.dll",
+    "pyqtbuild/bundle/dlls/msvc-32/msvcp140_atomic_wait.dll",
+    "pyqtbuild/bundle/dlls/msvc-32/msvcp140_codecvt_ids.dll",
+    "pyqtbuild/bundle/dlls/msvc-32/vccorlib140.dll",
+    "pyqtbuild/bundle/dlls/msvc-32/vcruntime140.dll",
+    "pyqtbuild/bundle/dlls/msvc-32/vcruntime140_threads.dll",
+    "pyqtbuild/bundle/dlls/msvc-64/concrt140.dll",
+    "pyqtbuild/bundle/dlls/msvc-64/msvcp140.dll",
+    "pyqtbuild/bundle/dlls/msvc-64/msvcp140_1.dll",
+    "pyqtbuild/bundle/dlls/msvc-64/msvcp140_2.dll",
+    "pyqtbuild/bundle/dlls/msvc-64/msvcp140_atomic_wait.dll",
+    "pyqtbuild/bundle/dlls/msvc-64/msvcp140_codecvt_ids.dll",
+    "pyqtbuild/bundle/dlls/msvc-64/vccorlib140.dll",
+    "pyqtbuild/bundle/dlls/msvc-64/vcruntime140.dll",
+    "pyqtbuild/bundle/dlls/msvc-64/vcruntime140_1.dll",
+    "pyqtbuild/bundle/dlls/msvc-64/vcruntime140_threads.dll",
+    "pyqtbuild/bundle/dlls/msvc-arm64/concrt140.dll",
+    "pyqtbuild/bundle/dlls/msvc-arm64/msvcp140.dll",
+    "pyqtbuild/bundle/dlls/msvc-arm64/msvcp140_1.dll",
+    "pyqtbuild/bundle/dlls/msvc-arm64/msvcp140_2.dll",
+    "pyqtbuild/bundle/dlls/msvc-arm64/msvcp140_atomic_wait.dll",
+    "pyqtbuild/bundle/dlls/msvc-arm64/msvcp140_codecvt_ids.dll",
+    "pyqtbuild/bundle/dlls/msvc-arm64/vccorlib140.dll",
+    "pyqtbuild/bundle/dlls/msvc-arm64/vcruntime140.dll",
+    "pyqtbuild/bundle/dlls/msvc-arm64/vcruntime140_1.dll",
+    "pyqtbuild/bundle/dlls/msvc-arm64/vcruntime140_threads.dll",
+    "pyqtbuild/bundle/dlls/openssl-32/libcrypto-1_1.dll",
+    "pyqtbuild/bundle/dlls/openssl-32/libssl-1_1.dll",
+    "pyqtbuild/bundle/dlls/openssl-64/libcrypto-1_1-x64.dll",
+    "pyqtbuild/bundle/dlls/openssl-64/libssl-1_1-x64.dll",
+    "pyqtbuild/bundle/packages/__init__.py",
+    "pyqtbuild/bundle/packages/pyqt.py",
+    "pyqtbuild/bundle/packages/pyqt3d.py",
+    "pyqtbuild/bundle/packages/pyqt5.py",
+    "pyqtbuild/bundle/packages/pyqt6.py",
+    "pyqtbuild/bundle/packages/pyqt6_3d.py",
+    "pyqtbuild/bundle/packages/pyqt6_canvaspainter.py",
+    "pyqtbuild/bundle/packages/pyqt6_charts.py",
+    "pyqtbuild/bundle/packages/pyqt6_datavisualization.py",
+    "pyqtbuild/bundle/packages/pyqt6_graphs.py",
+    "pyqtbuild/bundle/packages/pyqt6_networkauth.py",
+    "pyqtbuild/bundle/packages/pyqt6_webengine.py",
+    "pyqtbuild/bundle/packages/pyqtchart.py",
+    "pyqtbuild/bundle/packages/pyqtdatavisualization.py",
+    "pyqtbuild/bundle/packages/pyqtnetworkauth.py",
+    "pyqtbuild/bundle/packages/pyqtpurchasing.py",
+    "pyqtbuild/bundle/packages/pyqtwebengine.py",
+    "pyqtbuild/bundle/qt_metadata.py",
+    "pyqtbuild/bundle/qt_wheel.py",
+    "pyqtbuild/bundle/qt_wheel_distinfo/LICENSE.gpl3",
+    "pyqtbuild/bundle/qt_wheel_distinfo/LICENSE.lgpl3",
+    "pyqtbuild/bundle/qt_wheel_distinfo/METADATA",
+    "pyqtbuild/bundle/qt_wheel_distinfo/WHEEL",
+    "pyqtbuild/bundle/qt_wheel_main.py",
+    "pyqtbuild/bundle/verbose.py",
+    "pyqtbuild/bundle/wheel.py",
+    "pyqtbuild/installable.py",
+    "pyqtbuild/project.py",
+    "pyqtbuild/version.py"
+  ]
+}

pyqt_builder-1.20.0/PyQt_builder.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.20.0",
+  "distance": 0,
+  "node": "ga6c3155ee4df71d1ced9785eef287a7829c2f2e3",
+  "dirty": false,
+  "branch": "main",
+  "node_date": "2026-10-04"
+}

{pyqt_builder-1.19.0 → pyqt_builder-1.20.0}/pyproject.toml

@@ -13,7 +13,7 @@ description = "The PyQt build system"
 readme = "README.md"
 urls.homepage = "https://github.com/Python-PyQt/PyQt-builder"
 dependencies = ["packaging", "sip >=6.7, <7"]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 license = "BSD-2-Clause"
 license-files = ["LICENSE"]
 dynamic = ["version"]

pyqt_builder-1.20.0/pyqtbuild/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '1.20.0'
+__version_tuple__ = version_tuple = (1, 20, 0)
+
+__commit_id__ = commit_id = 'ga6c3155ee'

{pyqt_builder-1.19.0 → pyqt_builder-1.20.0}/pyqtbuild/bindings.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
-# Copyright (c) 2024 Phil Thompson <phil@riverbankcomputing.com>
+# Copyright (c) 2026 Phil Thompson <phil@riverbankcomputing.com>
 
 
 import glob
@@ -51,7 +51,7 @@ class PyQtBindings(Bindings):
             project = self.project
 
             self.tags = ['{}_{}'.format(project.tag_prefix,
-                    project.builder.qt_version_tag)]
+                    project.get_version_tag())]
 
         super().apply_user_defaults(tool)
 

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

@@ -115,9 +115,14 @@ class QmakeBuilder(Builder):
                 else:
                     project.minimum_glibc_version = '2.17'
 
-            # Set the default minimum macOS version.
+            # Set the default minimum macOS version.  These may not be exact
+            # as they have to be supported by pip (see 'pip debug --verbose')
+            # which tends not only support '.0' versions.  Note that we didn't
+            # keep these up to date for Qt6 until v6.12.
             if not project.minimum_macos_version:
-                if self.qt_version >= 0x060000:
+                if self.qt_version >= 0x060c00:
+                    project.minimum_macos_version = '14.0'
+                elif self.qt_version >= 0x060000:
                     project.minimum_macos_version = '10.14'
                 elif self.qt_version >= 0x050e00:
                     project.minimum_macos_version = '10.13'
@@ -136,13 +141,12 @@ class QmakeBuilder(Builder):
 
             # Set the default ABI major version of the sip module.  These
             # should track the versions specified by the latest versions of
-            # PyQt5 and PyQt6 (and vice versa).  This can be removed completely
-            # when PyQt5 and PyQt6 use %MinimumABIVersion unconditionaly.
+            # PyQt5 and PyQt6 (and vice versa).  This should be removed in v2.
             if not project.abi_version:
                 if project.sip_module == 'PyQt5.sip':
-                    project.abi_version = '12.15'
+                    project.abi_version = '12.20'
                 elif project.sip_module == 'PyQt6.sip':
-                    project.abi_version = '13.8'
+                    project.abi_version = '13.13'
 
         super().apply_user_defaults(tool)
 

{pyqt_builder-1.19.0 → pyqt_builder-1.20.0}/pyqtbuild/bundle/packages/pyqt.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
@@ -22,9 +22,14 @@ class PyQt(AbstractPackage):
 
         verbose("Bundling the MSVC runtime")
 
-        self._bundle_dlls(target_qt_dir,
-                os.path.join(_DLLS_DIR,
-                        'msvc-64' if platform_tag == 'win_amd64' else 'msvc-32'))
+        if platform_tag == 'win_arm64':
+            subdir = 'msvc-arm64'
+        elif platform_tag == 'win_amd64':
+            subdir = 'msvc-64'
+        else:
+            subdir = 'msvc-32'
+
+        self._bundle_dlls(target_qt_dir, os.path.join(_DLLS_DIR, subdir))
 
     def bundle_openssl(self, target_qt_dir, openssl_dir, platform_tag):
         """ Bundle the OpenSSL DLLs. """

{pyqt_builder-1.19.0 → pyqt_builder-1.20.0}/pyqtbuild/bundle/packages/pyqt6.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
-# Copyright (c) 2024 Phil Thompson <phil@riverbankcomputing.com>
+# Copyright (c) 2026 Phil Thompson <phil@riverbankcomputing.com>
 
 
 from ..qt_metadata import VersionedMetadata
@@ -17,6 +17,15 @@ _QT_METADATA = {
         VersionedMetadata(version=(6, 2, 0)),
 
     'QtCore': (
+        VersionedMetadata(version=(6, 12, 0),
+            other_lib_deps={
+                'linux': ('libicui18n.so.73', 'libicuuc.so.73',
+                          'libicudata.so.73')},
+            translations=('qt_', 'qt_help', 'qtbase', 'qtconnectivity',
+                'qtdeclarative', 'qtlocation', 'qtmultimedia',
+                'qtquickcontrols2', 'qtserialport', 'qtwebsockets'),
+            excluded_plugins=('designer', 'qmltooling',
+                'qtwebview_webengine')),
         VersionedMetadata(version=(6, 7, 0),
             other_lib_deps={
                 'linux': ('libicui18n.so.73', 'libicuuc.so.73',
@@ -67,6 +76,25 @@ _QT_METADATA = {
     #    VersionedMetadata(),
 
     'QtMultimedia': (
+        VersionedMetadata(version=(6, 12, 0),
+                lib_deps={'': ('QtMultimediaQuick', )},
+                other_lib_deps={
+                    'linux': (
+                            'libQt6FFmpegStub-crypto.so.3',
+                            'libQt6FFmpegStub-ssl.so.3',
+                            'libQt6FFmpegStub-va.so.2',
+                            'libQt6FFmpegStub-va-drm.so.2',
+                            'libQt6FFmpegStub-va-x11.so.2',
+                            'libavcodec.so.63', 'libavformat.so.63',
+                            'libavutil.so.61', 'libswresample.so.7',
+                            'libswscale.so.10'),
+                    'macos': ('libavcodec.63.dylib', 'libavformat.63.dylib',
+                            'libavutil.61.dylib', 'libswresample.7.dylib',
+                            'libswscale.10.dylib'),
+                    'win': ('avcodec-63.dll', 'avformat-63.dll',
+                            'avutil-61.dll', 'swresample-7.dll',
+                            'swscale-10.dll')},
+                ),
         VersionedMetadata(version=(6, 8, 0),
                 lib_deps={'': ('QtMultimediaQuick', )},
                 other_lib_deps={
@@ -123,11 +151,11 @@ _QT_METADATA = {
         VersionedMetadata(),
 
     'QtPdf':
-        VersionedMetadata(version=(6, 4, 0),
+        VersionedMetadata(version=(6, 4, 0), until_version=(6, 12, 0),
                 lib_deps={'': ('QtPdfQuick', )}),
 
     'QtPdfWidgets':
-        VersionedMetadata(version=(6, 4, 0)),
+        VersionedMetadata(version=(6, 4, 0), until_version=(6, 12, 0)),
 
     'QtPositioning':
         VersionedMetadata(version=(6, 2, 0),
@@ -138,6 +166,13 @@ _QT_METADATA = {
         VersionedMetadata(),
 
     'QtQml': (
+        VersionedMetadata(version=(6, 9, 0),
+                lib_deps={'': ('QtQmlCore', 'QtQmlMeta', 'QtQmlModels',
+                        'QtQmlWorkerScript', 'QtLabsAnimation',
+                        'QtLabsFolderListModel', 'QtLabsPlatform',
+                        'QtLabsQmlModels', 'QtLabsSettings',
+                        'QtLabsSharedImage', 'QtLabsWavefrontMesh')},
+                ),
         VersionedMetadata(version=(6, 8, 0),
                 lib_deps={'': ('QtQmlMeta', 'QtQmlModels', 'QtQmlWorkerScript',
                         'QtLabsAnimation', 'QtLabsFolderListModel',

pyqt_builder-1.20.0/pyqtbuild/bundle/packages/pyqt6_canvaspainter.py

@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: BSD-2-Clause
+
+# Copyright (c) 2026 Phil Thompson <phil@riverbankcomputing.com>
+
+
+from ..abstract_package import AbstractPackage
+from ..qt_metadata import VersionedMetadata
+
+
+# The Qt meta-data for this package.
+_QT_METADATA = {
+    'QtCanvasPainter':
+        VersionedMetadata(version=(6, 12, 0), lgpl=False),
+}
+
+
+class PyQt6_CanvasPainter(AbstractPackage):
+    """ The PyQt6-CanvasPainter package. """
+
+    def get_qt_metadata(self):
+        """ Return the package-specific meta-data describing the parts of Qt to
+        install.
+        """
+
+        return _QT_METADATA

{pyqt_builder-1.19.0 → pyqt_builder-1.20.0}/pyqtbuild/bundle/packages/pyqt6_webengine.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
-# Copyright (c) 2024 Phil Thompson <phil@riverbankcomputing.com>
+# Copyright (c) 2026 Phil Thompson <phil@riverbankcomputing.com>
 
 
 from ..abstract_package import AbstractPackage
@@ -9,7 +9,13 @@ from ..qt_metadata import VersionedMetadata
 
 # The Qt meta-data for this package.
 _QT_METADATA = {
-    'QtWebEngineCore':
+    'QtPdf':
+        VersionedMetadata(version=(6, 12, 0),
+                lib_deps={'': ('QtPdfQuick', )}),
+
+    'QtPdfWidgets':
+        VersionedMetadata(version=(6, 12, 0)),
+    'QtWebEngineCore': (
         VersionedMetadata(version=(6, 2, 0),
             translations=('qtwebengine', ),
             other_lib_deps={
@@ -21,11 +27,28 @@ _QT_METADATA = {
             files={
                 'win':  (('lib\\Qt6Core.lib',
                         "Enable QtWebEngineProcess to find it's resources.\n"), )},
+            included_plugins=(('webview', 'qtwebview_webengine'), ),
             others={
                 'linux': ('resources', 'translations/qtwebengine_locales'),
                 'win':   ('resources', 'translations\\qtwebengine_locales')},
             subwheel_files={
                 '':      (('qtlib', 'QtWebEngineCore'), )}),
+        VersionedMetadata(version=(6, 2, 0),
+            translations=('qtwebengine', ),
+            other_lib_deps={
+                'macos': ('QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Info.plist', )},
+            exes={
+                'linux': ('libexec/QtWebEngineProcess', ),
+                'macos': ('lib/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess', ),
+                'win':   ('bin\\QtWebEngineProcess.exe', )},
+            files={
+                'win':  (('lib\\Qt6Core.lib',
+                        "Enable QtWebEngineProcess to find it's resources.\n"), )},
+            others={
+                'linux': ('resources', 'translations/qtwebengine_locales'),
+                'win':   ('resources', 'translations\\qtwebengine_locales')},
+            subwheel_files={
+                '':      (('qtlib', 'QtWebEngineCore'), )})),
 
     'QtWebEngineQuick':
         VersionedMetadata(version=(6, 2, 0),

{pyqt_builder-1.19.0 → pyqt_builder-1.20.0}/pyqtbuild/bundle/qt_metadata.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
-# Copyright (c) 2024 Phil Thompson <phil@riverbankcomputing.com>
+# Copyright (c) 2026 Phil Thompson <phil@riverbankcomputing.com>
 
 
 import fnmatch
@@ -18,13 +18,15 @@ class VersionedMetadata:
     version of Qt.
     """
 
-    def __init__(self, *, version=None, name=None, lib_deps=None,
-            other_lib_deps=None, exes=None, files=None, others=None, dll=True,
-            qml_names=None, translations=None, excluded_plugins=None,
-            lgpl=True, legacy=False, subwheel_files=None):
+    def __init__(self, *, version=None, until_version=None, name=None,
+            lib_deps=None, other_lib_deps=None, exes=None, files=None,
+            others=None, dll=True, qml_names=None, translations=None,
+            excluded_plugins=None, included_plugins=None, lgpl=True,
+            legacy=False, subwheel_files=None):
         """ Initialise the versioned bindings. """
 
         self._version = version
+        self._until_version = until_version
         self._name = name
         self._lib_deps = {} if lib_deps is None else lib_deps
         self._other_lib_deps = {} if other_lib_deps is None else other_lib_deps
@@ -35,6 +37,7 @@ class VersionedMetadata:
         self._qml_names = qml_names
         self._translations = () if translations is None else translations
         self._excluded_plugins = excluded_plugins
+        self._included_plugins = included_plugins
         self._subwheel_files = {} if subwheel_files is None else subwheel_files
 
         self.lgpl = lgpl
@@ -163,14 +166,23 @@ class VersionedMetadata:
                     target_qt_dir, qt_dir, platform_tag, macos_thin_arch,
                     ignore_missing, skip_files=skip_files)
 
-        # Bundle any plugins.  We haven't done the analysis of which plugins
-        # belong to which package so we assume that only the QtCore package
-        # will specify any to exclude and we bundle all of them with that.
+        # If any excluded plugins have been specified then assume we should
+        # bundle the rest.
         if self._excluded_plugins is not None:
             self._bundle_nondebug('plugins', target_qt_dir, qt_dir,
                     platform_tag, macos_thin_arch, ignore_missing,
                     skip_files=skip_files, exclude=self._excluded_plugins)
 
+        # Bundle any explicitly included plugins.  Note that it makes no sense
+        # to specify excluded and included plugins for the same module.
+        if self._included_plugins is not None:
+            for plugin_subdir, plugin in self._included_plugins:
+                plugin_impl = self._impl_from_plugin(plugin, platform_tag)
+                self._bundle_file(
+                        os.path.join('plugins', plugin_subdir, plugin_impl),
+                        target_qt_dir, qt_dir, platform_tag, macos_thin_arch,
+                        ignore_missing, skip_files=skip_files)
+
         # Bundle any translations:
         if self._translations:
             target_tr_dir = os.path.join(target_qt_dir, 'translations')
@@ -208,6 +220,9 @@ class VersionedMetadata:
         version.
         """
 
+        if self._until_version is not None and qt_version >= self._until_version:
+            return False
+
         return self._version is None or qt_version >= self._version
 
     @classmethod
@@ -220,23 +235,31 @@ class VersionedMetadata:
 
         for dirpath, dirnames, filenames in os.walk(os.path.join(qt_dir, src_dir)):
             for ignore in exclude:
-                try:
+                if ignore in dirnames:
+                    verbose(f"Excluding {ignore} plugin directory.")
                     dirnames.remove(ignore)
-                except ValueError:
-                    pass
 
             for name in list(dirnames):
                 if cls._is_debug(name, platform_tag):
+                    verbose(f"Excluding {name} plugin directory.")
                     dirnames.remove(name)
 
             for name in filenames:
                 if cls._is_debug(name, platform_tag):
                     continue
 
-                cls._bundle_file(
-                        os.path.relpath(os.path.join(dirpath, name), qt_dir),
-                        target_qt_dir, qt_dir, platform_tag, macos_thin_arch,
-                        ignore_missing, skip_files=skip_files)
+                for ignore in exclude:
+                    plugin = cls._impl_from_plugin(ignore, platform_tag)
+                    if plugin == name:
+                        verbose(f"Excluding {ignore} plugin.")
+                        break
+                else:
+                    cls._bundle_file(
+                            os.path.relpath(
+                                    os.path.join(dirpath, name), qt_dir),
+                            target_qt_dir, qt_dir, platform_tag,
+                            macos_thin_arch, ignore_missing,
+                            skip_files=skip_files)
 
     @classmethod
     def _bundle_exe(cls, name, target_qt_dir, qt_dir, qt_version, platform_tag,
@@ -425,6 +448,19 @@ class VersionedMetadata:
         if cls._is_platform('win', platform_tag):
             return 'Qt{}{}.dll'.format(qt_major, name[2:])
 
+    @classmethod
+    def _impl_from_plugin(cls, name, platform_tag):
+        """ Return the architecture-specific name of a plugin. """
+
+        if cls._is_platform('linux', platform_tag):
+            return 'lib{}.so'.format(name)
+
+        if cls._is_platform('macos', platform_tag):
+            return 'lib{}.dylib'.format(name)
+
+        if cls._is_platform('win', platform_tag):
+            return name + '.dll'
+
     @classmethod
     def _is_debug(cls, name, platform_tag):
         """ Return True if a name implies a debug version. """

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

@@ -136,7 +136,7 @@ def qt_wheel(package, qt_dir, build_tag, suffix, msvc_runtime, openssl,
     lgpl = package.bundle_qt(target_qt_dir, platform_tag, exclude,
             ignore_missing=True, bindings=False, subwheel=subwheel)
 
-    if platform_tag in ('win32', 'win_amd64'):
+    if platform_tag in ('win32', 'win_amd64', 'win_arm64'):
         # Bundle the MSVC runtime if required.
         if msvc_runtime:
             package.bundle_msvc_runtime(target_qt_dir, platform_tag)

{pyqt_builder-1.19.0 → pyqt_builder-1.20.0}/pyqtbuild/project.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
-# Copyright (c) 2024 Phil Thompson <phil@riverbankcomputing.com>
+# Copyright (c) 2026 Phil Thompson <phil@riverbankcomputing.com>
 
 
 import os
@@ -192,3 +192,12 @@ class PyQtProject(Project):
                 metavar="DIR", tools=['wheel']))
 
         return options
+
+    def get_version_tag(self):
+        """ Return the version tag (ie. a '_' separated 3-tuple version number)
+        to be used in the default tags.  This allows a project to use a version
+        tag that is not based on the Qt version number.
+        """
+
+        # The default is the version tag provided by the builder.
+        return self.builder.qt_version_tag

pyqt_builder-1.19.0/pyqtbuild/_version.py

@@ -1,34 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    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.19.0'
-__version_tuple__ = version_tuple = (1, 19, 0)
-
-__commit_id__ = commit_id = 'g2c1ca1c73'