[neon/forks/pyqt5/Neon/release] /: New upstream version 5.15.6+dfsg
Dmitry Shachnev
null at kde.org
Mon May 2 23:42:27 BST 2022
Git commit 07177f78315b179acc9935ba34fbf73d47b75432 by Dmitry Shachnev.
Committed on 31/10/2021 at 10:20.
Pushed by sitter into branch 'Neon/release'.
New upstream version 5.15.6+dfsg
M +26 -0 ChangeLog
M +3 -0 NEWS
M +1 -1 PKG-INFO
M +1 -1 configure.py
M +2 -2 pyproject.toml
M +4 -1 pyuic/uic/Compiler/qtproxies.py
M +1 -1 sip/QtCore/QtCoremod.sip
M +2 -2 sip/QtCore/qbytearray.sip
M +2 -2 sip/QtCore/qglobal.sip
M +1 -1 sip/QtCore/qobject.sip
https://invent.kde.org/neon/forks/pyqt5/commit/07177f78315b179acc9935ba34fbf73d47b75432
diff --git a/ChangeLog b/ChangeLog
index 40df35eb..a5a30b38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2021-10-24 Phil Thompson <phil at riverbankcomputing.com>
+
+ * pyuic/uic/Compiler/qtproxies.py:
+ Generate typing information to ignore connect() in pyuic generated
+ code.
+ [34cb760572b8] [5.15.6] <5.15-maint>
+
+ * PyQt5.msp:
+ Remove QObject.__getattr__() from QtCore.pyi as it hides
+ missing/mistyped attribute names.
+ [ba5c19ab8690] <5.15-maint>
+
+ * NEWS, PyQt5.msp, lib/pyproject.toml:
+ Fixed pickling of QByteArray with Python v3.10.
+ [2ed6a8e59201] <5.15-maint>
+
+ * test/tests/classes/test_QByteArray.py:
+ Added the QByteArray pickle test.
+ [6e7bdf2d8c92] <5.15-maint>
+
+2021-10-12 Phil Thompson <phil at riverbankcomputing.com>
+
+ * .hgtags:
+ Added tag 5.15.5 for changeset ab35506238c2
+ [965570c2c344] <5.15-maint>
+
2021-10-07 Phil Thompson <phil at riverbankcomputing.com>
* NEWS, pyuic/uic/Compiler/qtproxies.py:
diff --git a/NEWS b/NEWS
index d2b1edbc..36ef3eaf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+v5.15.6 24th October 2021
+ - Bug fixes.
+
v5.15.5 7th October 2021
- Added the missing QPdfWriter.setPageSize() overload.
- pylupdate5 now assumes that the default codec is UTF-8 and specified v2.1
diff --git a/PKG-INFO b/PKG-INFO
index 385ad30c..a6dcd031 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: PyQt5
-Version: 5.15.5
+Version: 5.15.6
Requires-Python: >=3.6
Summary: Python bindings for the Qt cross platform application toolkit
Home-Page: https://www.riverbankcomputing.com/software/pyqt/
diff --git a/configure.py b/configure.py
index bb5f88a1..28b9ad43 100644
--- a/configure.py
+++ b/configure.py
@@ -28,7 +28,7 @@ import sys
# Initialise the constants.
-PYQT_VERSION_STR = "5.15.5"
+PYQT_VERSION_STR = "5.15.6"
SIP_MIN_VERSION = '4.19.23'
diff --git a/pyproject.toml b/pyproject.toml
index 553e835b..5a50609d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,12 +1,12 @@
# Specify the build system requirements.
[build-system]
-requires = ["sip >=5.3, <7", "PyQt-builder >=1.9, <2"]
+requires = ["sip >=6.4, <7", "PyQt-builder >=1.9, <2"]
build-backend = "sipbuild.api"
# Specify the PEP 566 metadata for the project.
[tool.sip.metadata]
name = "PyQt5"
-version = "5.15.5"
+version = "5.15.6"
summary = "Python bindings for the Qt cross platform application toolkit"
home-page = "https://www.riverbankcomputing.com/software/pyqt/"
author = "Riverbank Computing Limited"
diff --git a/pyuic/uic/Compiler/qtproxies.py b/pyuic/uic/Compiler/qtproxies.py
index 8041d2b0..8646ae24 100644
--- a/pyuic/uic/Compiler/qtproxies.py
+++ b/pyuic/uic/Compiler/qtproxies.py
@@ -134,6 +134,9 @@ class ProxyClassMember(object):
if needs_translation:
i18n_print(func_call)
else:
+ if self.function_name == 'connect':
+ func_call += ' # type: ignore'
+
write_code(func_call)
def __getattribute__(self, attribute):
@@ -174,7 +177,7 @@ class ProxySignalWithArguments(object):
self._signal_index = "'%s'" % signal_index
def connect(self, slot):
- write_code("%s.%s[%s].connect(%s)" % (self._sender, self._signal_name, self._signal_index, slot))
+ write_code("%s.%s[%s].connect(%s) # type: ignore" % (self._sender, self._signal_name, self._signal_index, slot))
class ProxyClass(ProxyBase):
diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip
index 1e2b8ba9..b525bc5c 100644
--- a/sip/QtCore/QtCoremod.sip
+++ b/sip/QtCore/QtCoremod.sip
@@ -20,7 +20,7 @@
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
+%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True, py_ssize_t_clean=True)
%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_13_0 Qt_5_14_0 Qt_5_15_0}
diff --git a/sip/QtCore/qbytearray.sip b/sip/QtCore/qbytearray.sip
index 9e807752..5fef3648 100644
--- a/sip/QtCore/qbytearray.sip
+++ b/sip/QtCore/qbytearray.sip
@@ -150,9 +150,9 @@ return 0;
%PickleCode
#if PY_MAJOR_VERSION >= 3
- sipRes = Py_BuildValue((char *)"(y#)", sipCpp->data(), sipCpp->size());
+ sipRes = Py_BuildValue((char *)"(y#)", sipCpp->data(), static_cast<Py_ssize_t>(sipCpp->size()));
#else
- sipRes = Py_BuildValue((char *)"(s#)", sipCpp->data(), sipCpp->size());
+ sipRes = Py_BuildValue((char *)"(s#)", sipCpp->data(), static_cast<Py_ssize_t>(sipCpp->size()));
#endif
%End
diff --git a/sip/QtCore/qglobal.sip b/sip/QtCore/qglobal.sip
index 9ddfb581..c7a073a0 100644
--- a/sip/QtCore/qglobal.sip
+++ b/sip/QtCore/qglobal.sip
@@ -29,8 +29,8 @@ int PYQT_VERSION;
const char *PYQT_VERSION_STR;
%ModuleCode
-static int PYQT_VERSION = 0x050f05;
-static const char *PYQT_VERSION_STR = "5.15.5";
+static int PYQT_VERSION = 0x050f06;
+static const char *PYQT_VERSION_STR = "5.15.6";
%End
const int QT_VERSION;
const char *QT_VERSION_STR;
diff --git a/sip/QtCore/qobject.sip b/sip/QtCore/qobject.sip
index 43782a1a..4f975a46 100644
--- a/sip/QtCore/qobject.sip
+++ b/sip/QtCore/qobject.sip
@@ -444,7 +444,7 @@ callable.
return qpycore_pyqtconfigure(sipSelf, sipArgs, sipKwds);
%End
- SIP_PYOBJECT __getattr__(const char *name /Encoding="UTF-8"/) const;
+ SIP_PYOBJECT __getattr__(const char *name /Encoding="UTF-8"/) const /NoTypeHint/;
%MethodCode
sipRes = qpycore_qobject_getattr(sipCpp, sipSelf, a0);
%End
More information about the Neon-commits
mailing list