[neon/forks/pyqt-builder/Neon/release] /: New upstream version 1.14.0+dfsg
Dmitry Shachnev
null at kde.org
Sat Feb 4 00:17:50 GMT 2023
Git commit 1ab773da66fb75b8e6e7b46ab82aa5607477a486 by Dmitry Shachnev.
Committed on 13/10/2022 at 20:54.
Pushed by carlosdem into branch 'Neon/release'.
New upstream version 1.14.0+dfsg
M +60 -0 ChangeLog
M +4 -0 NEWS
M +1 -1 PKG-INFO
M +1 -1 PyQt_builder.egg-info/PKG-INFO
M +1 -1 PyQt_builder.egg-info/requires.txt
M +9 -6 pyqtbuild/builder.py
M +18 -3 pyqtbuild/bundle/packages/pyqt6.py
M +2 -2 pyqtbuild/bundle/qt_wheel_main.py
M +3 -3 pyqtbuild/project.py
M +2 -2 pyqtbuild/version.py
M +1 -1 setup.py
https://invent.kde.org/neon/forks/pyqt-builder/commit/1ab773da66fb75b8e6e7b46ab82aa5607477a486
diff --git a/ChangeLog b/ChangeLog
index a650e54..bde0032 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+2022-09-21 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS, pyqtbuild/bundle/packages/pyqt6.py:
+ Fixed the QtQuick3D metadata for Qt v6.4.0.
+ [274306a008c8] [1.14.0]
+
+2022-09-20 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS, pyqtbuild/bundle/packages/pyqt6.py:
+ Added support for QtPdfWidgets for PyQt6.
+ [aa85c93ee908]
+
+ * NEWS, pyqtbuild/bundle/packages/pyqt6.py:
+ Added support for QtPdf for PyQt6.
+ [052b671c9e8a]
+
+ * NEWS, pyqtbuild/bundle/packages/pyqt6.py:
+ Added support for QtTextToSpeech for PyQt6.
+ [7d56949378ae]
+
+2022-09-18 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS:
+ Updated the NEWS file.
+ [b795e017a440]
+
+ * Merged the 1.13-maint branch.
+ [48ad8094adc1]
+
+2022-09-07 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS, pyqtbuild/project.py:
+ Remove the use of distutils.
+ [cdebac42f8ce] <1.13-maint>
+
+2022-07-28 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS, pyqtbuild/bundle/qt_wheel_main.py:
+ Fixed a misleading help text in pyqt-qt-wheel.
+ [3b8329c9063d] <1.13-maint>
+
+2022-07-19 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS, pyqtbuild/builder.py, setup.py:
+ Use the enhanced Project.get_sip_distinfo_command_line() added to
+ SIP v6.7 to specify the wheel generator and version.
+ [4aae6e9f0c28] <1.13-maint>
+
+2022-07-18 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS, pyqtbuild/builder.py:
+ Fixed the location of sip-distinfo.
+ [ecfed71612cc] <1.13-maint>
+
+2022-06-17 Phil Thompson <phil at riverbankcomputing.com>
+
+ * .hgtags:
+ Added tag 1.13.0 for changeset 068a418ac90b
+ [b5be160f07f1]
+
2022-06-06 Phil Thompson <phil at riverbankcomputing.com>
* NEWS, pyqtbuild/bundle/packages/pyqt6_webengine.py:
diff --git a/NEWS b/NEWS
index 723f00d..df69d06 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+v1.14.0 21st September 2022
+ - Added support for QtPdf, QtPdfWidgets and QtTextToSpeech for PyQt6.
+ - SIP v6.7 is now required.
+
v1.13.0 6th June 2022
- The default ABI versions are now v12.11 and v13.4 so that wrapped classes
can be used by sip.array.
diff --git a/PKG-INFO b/PKG-INFO
index 667514f..7f627af 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: PyQt-builder
-Version: 1.13.0
+Version: 1.14.0
Summary: The PEP 517 compliant PyQt build system
Home-page: https://www.riverbankcomputing.com/software/pyqt-builder/
Author: Riverbank Computing Limited
diff --git a/PyQt_builder.egg-info/PKG-INFO b/PyQt_builder.egg-info/PKG-INFO
index 667514f..7f627af 100644
--- a/PyQt_builder.egg-info/PKG-INFO
+++ b/PyQt_builder.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: PyQt-builder
-Version: 1.13.0
+Version: 1.14.0
Summary: The PEP 517 compliant PyQt build system
Home-page: https://www.riverbankcomputing.com/software/pyqt-builder/
Author: Riverbank Computing Limited
diff --git a/PyQt_builder.egg-info/requires.txt b/PyQt_builder.egg-info/requires.txt
index 9b2bbb0..06be9a4 100644
--- a/PyQt_builder.egg-info/requires.txt
+++ b/PyQt_builder.egg-info/requires.txt
@@ -1,2 +1,2 @@
packaging
-sip<7,>=6.3
+sip<7,>=6.7
diff --git a/pyqtbuild/builder.py b/pyqtbuild/builder.py
index 3f35a7f..5650932 100644
--- a/pyqtbuild/builder.py
+++ b/pyqtbuild/builder.py
@@ -30,6 +30,7 @@ from sipbuild import (Buildable, BuildableModule, Builder, Option, Project,
PyProjectOptionException, UserException)
from .installable import QmakeTargetInstallable
+from .version import PYQTBUILD_VERSION_STR
class QmakeBuilder(Builder):
@@ -55,9 +56,10 @@ class QmakeBuilder(Builder):
# it. However for our own frontends we want to use the version
# corresponding to the frontend (and, anyway, the frontend may not
# be on PATH).
- if tool != 'pep517':
- self._sip_distinfo = os.path.join(
- os.path.abspath(os.path.dirname(sys.argv[0])),
+ exe_dir, exe_name = os.path.split(sys.argv[0])
+
+ if exe_name.startswith('sip-'):
+ self._sip_distinfo = os.path.join(os.path.abspath(exe_dir),
self._sip_distinfo)
# Check we have a qmake.
@@ -80,8 +82,8 @@ class QmakeBuilder(Builder):
if self.spec is None:
self.spec = self.qt_configuration['QMAKE_SPEC']
- # The binary OS/X Qt installer used to default to XCode. If so
- # then use macx-clang.
+ # The Qt installer used to default to XCode. If so then use
+ # macx-clang.
if self.spec == 'macx-xcode':
# This will exist (and we can't check anyway).
self.spec = 'macx-clang'
@@ -228,7 +230,8 @@ class QmakeBuilder(Builder):
inventory.close()
args = project.get_sip_distinfo_command_line(self._sip_distinfo,
- inventory_fn, generator=os.path.basename(sys.argv[0]),
+ inventory_fn, generator='pyqtbuild',
+ generator_version=PYQTBUILD_VERSION_STR,
wheel_tag=wheel_tag)
args.append(self.qmake_quote(project.get_distinfo_dir(target_dir)))
diff --git a/pyqtbuild/bundle/packages/pyqt6.py b/pyqtbuild/bundle/packages/pyqt6.py
index 63ed06c..e0ba955 100644
--- a/pyqtbuild/bundle/packages/pyqt6.py
+++ b/pyqtbuild/bundle/packages/pyqt6.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -96,6 +96,13 @@ _QT_METADATA = {
'QtOpenGLWidgets':
VersionedMetadata(),
+ 'QtPdf':
+ VersionedMetadata(version=(6, 4, 0),
+ lib_deps={'': ('QtPdfQuick', )}),
+
+ 'QtPdfWidgets':
+ VersionedMetadata(version=(6, 4, 0)),
+
'QtPositioning':
VersionedMetadata(version=(6, 2, 0),
lib_deps={'': ('QtPositioningQuick', )},
@@ -125,6 +132,14 @@ _QT_METADATA = {
qml=True)),
'QtQuick3D': (
+ VersionedMetadata(version=(6, 4, 0),
+ lib_deps={
+ '': ('QtConcurrent', 'QtQuick3DAssetImport',
+ 'QtQuick3DAssetUtils', 'QtQuick3DEffects',
+ 'QtQuick3DHelpers', 'QtQuick3DIblBaker',
+ 'QtQuick3DParticles', 'QtQuick3DRuntimeRender',
+ 'QtQuick3DUtils', 'QtShaderTools')},
+ qml=True),
VersionedMetadata(version=(6, 1, 0),
lib_deps={
'': ('QtQuick3DAssetImport', 'QtQuick3DAssetUtils',
@@ -167,8 +182,8 @@ _QT_METADATA = {
'QtTest':
VersionedMetadata(qml=True),
- #'QtTextToSpeech':
- # VersionedMetadata(),
+ 'QtTextToSpeech':
+ VersionedMetadata(version=(6, 4, 0), qml=True),
'QtWebChannel':
VersionedMetadata(version=(6, 2, 0), qml=True),
diff --git a/pyqtbuild/bundle/qt_wheel_main.py b/pyqtbuild/bundle/qt_wheel_main.py
index ae7153b..8f8d5d6 100644
--- a/pyqtbuild/bundle/qt_wheel_main.py
+++ b/pyqtbuild/bundle/qt_wheel_main.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -75,7 +75,7 @@ def main():
help="append SUFFIX to the Qt version number")
parser.add_argument(dest='packages', nargs=1, help="the PyQt package",
- metavar="package")
+ metavar="PACKAGE")
args = parser.parse_args()
diff --git a/pyqtbuild/project.py b/pyqtbuild/project.py
index 8a816ad..f11d59f 100644
--- a/pyqtbuild/project.py
+++ b/pyqtbuild/project.py
@@ -93,11 +93,11 @@ class PyQtProject(Project):
self.py_minor_version, abi)
pylib_dir = pylib_shlib = ''
- # Use distutils to get the additional configuration.
- from distutils import sysconfig
+ # Get the additional configuration.
from glob import glob
+ from sysconfig import get_config_vars
- ducfg = sysconfig.get_config_vars()
+ ducfg = get_config_vars()
config_args = ducfg.get('CONFIG_ARGS', '')
diff --git a/pyqtbuild/version.py b/pyqtbuild/version.py
index b9cc118..845a05d 100644
--- a/pyqtbuild/version.py
+++ b/pyqtbuild/version.py
@@ -1,2 +1,2 @@
-PYQTBUILD_VERSION = 0x010d00
-PYQTBUILD_VERSION_STR = '1.13.0'
+PYQTBUILD_VERSION = 0x010e00
+PYQTBUILD_VERSION_STR = '1.14.0'
diff --git a/setup.py b/setup.py
index 3c8d47f..5febf02 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ setup(
version=version,
license='SIP',
python_requires='>=3.7',
- install_requires=['packaging', 'sip >=6.3, <7'],
+ install_requires=['packaging', 'sip >=6.7, <7'],
packages=find_packages(),
package_data={
'pyqtbuild.bundle': ['dlls/*/*', 'qt_wheel_distinfo/*'],
More information about the Neon-commits
mailing list