Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pyqt-builder for openSUSE:Factory checked in at 2022-06-25 10:23:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyqt-builder (Old) and /work/SRC/openSUSE:Factory/.python-pyqt-builder.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyqt-builder" Sat Jun 25 10:23:41 2022 rev:11 rq:984219 version:1.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyqt-builder/python-pyqt-builder.changes 2021-10-31 22:56:18.947729305 +0100 +++ /work/SRC/openSUSE:Factory/.python-pyqt-builder.new.1548/python-pyqt-builder.changes 2022-06-25 10:23:42.830626778 +0200 @@ -1,0 +2,9 @@ +Mon Jun 20 21:19:02 UTC 2022 - Ben Greiner <c...@bnavigator.de> + +- Update to version 1.13.0 + * The default ABI versions are now v12.11 and v13.4 so that + wrapped classes can be used by sip.array. + * Removed support for bundling version of Qt older than v5.15. + * Removed support for Python v3.6. + +------------------------------------------------------------------- Old: ---- PyQt-builder-1.12.2.tar.gz New: ---- PyQt-builder-1.13.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyqt-builder.spec ++++++ --- /var/tmp/diff_new_pack.cYHYm1/_old 2022-06-25 10:23:43.474627698 +0200 +++ /var/tmp/diff_new_pack.cYHYm1/_new 2022-06-25 10:23:43.478627703 +0200 @@ -17,16 +17,15 @@ %define mname pyqt-builder -%{?!python_module:%define python_module() python3-%{**}} -%define skip_python2 1 Name: python-%{mname} -Version: 1.12.2 +Version: 1.13.0 Release: 0 Summary: The PEP 517 compliant PyQt build system License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP URL: https://www.riverbankcomputing.com/software/pyqt-builder Source0: https://files.pythonhosted.org/packages/source/P/PyQt-builder/PyQt-builder-%{version}.tar.gz BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module base >= 3.7} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-sip-devel >= 6.3 ++++++ PyQt-builder-1.12.2.tar.gz -> PyQt-builder-1.13.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/ChangeLog new/PyQt-builder-1.13.0/ChangeLog --- old/PyQt-builder-1.12.2/ChangeLog 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/ChangeLog 2022-06-17 16:38:04.000000000 +0200 @@ -1,3 +1,55 @@ +2022-06-06 Phil Thompson <p...@riverbankcomputing.com> + + * NEWS, pyqtbuild/bundle/packages/pyqt6_webengine.py: + Fix the missing translations from PyQt6-WebEngine. + [068a418ac90b] [1.13.0] + +2022-05-17 Phil Thompson <p...@riverbankcomputing.com> + + * NEWS, pyqtbuild/builder.py: + The default ABI versions are now v12.11 and v13.4. + [45bb2785fa46] + +2022-05-13 Phil Thompson <p...@riverbankcomputing.com> + + * NEWS, pyqtbuild/bundle/packages/pyqt5.py: + Fixed a syntax regression. + [42b3c6a05629] + +2022-04-18 Phil Thompson <p...@riverbankcomputing.com> + + * pyqtbuild/bundle/abstract_package.py, + pyqtbuild/bundle/packages/pyqt3d.py, + pyqtbuild/bundle/packages/pyqt5.py, + pyqtbuild/bundle/packages/pyqtchart.py, + pyqtbuild/bundle/packages/pyqtdatavisualization.py, + pyqtbuild/bundle/packages/pyqtnetworkauth.py, + pyqtbuild/bundle/packages/pyqtpurchasing.py, + pyqtbuild/bundle/qt_metadata.py: + Removed support for versions of Qt older than v5.15. + [bd1cfdc9b537] + + * pyqtbuild/bundle/dlls/openssl-32/libeay32.dll, + pyqtbuild/bundle/dlls/openssl-32/ssleay32.dll, + pyqtbuild/bundle/dlls/openssl-64/libeay32.dll, + pyqtbuild/bundle/dlls/openssl-64/ssleay32.dll: + Removed the OpenSSL DLLs not used by currently supported versions of + Python and Qt. + [d3ed99301b00] + + * NEWS, setup.py: + Python v3.7 is the minimum supported version. + [df64b05608f8] + + * Merged the 1.12-maint branch. + [32ee66dabb93] + +2021-10-28 Phil Thompson <p...@riverbankcomputing.com> + + * .hgtags: + Added tag 1.12.2 for changeset 3f1d1850862b + [42e269a7a226] <1.12-maint> + 2021-10-25 Phil Thompson <p...@riverbankcomputing.com> * pyqtbuild/bundle/qt_metadata.py: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/NEWS new/PyQt-builder-1.13.0/NEWS --- old/PyQt-builder-1.12.2/NEWS 2021-10-28 11:53:14.000000000 +0200 +++ new/PyQt-builder-1.13.0/NEWS 2022-06-17 16:37:55.000000000 +0200 @@ -1,3 +1,9 @@ +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. + - Removed support for bundling version of Qt older than v5.15. + - Removed support for Python v3.6. + v1.12.2 25th October 2021 - A bug fix release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/PKG-INFO new/PyQt-builder-1.13.0/PKG-INFO --- old/PyQt-builder-1.12.2/PKG-INFO 2021-10-28 11:53:19.971889700 +0200 +++ new/PyQt-builder-1.13.0/PKG-INFO 2022-06-17 16:38:05.220270600 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: PyQt-builder -Version: 1.12.2 +Version: 1.13.0 Summary: The PEP 517 compliant PyQt build system Home-page: https://www.riverbankcomputing.com/software/pyqt-builder/ Author: Riverbank Computing Limited @@ -9,7 +9,7 @@ Platform: X11 Platform: macOS Platform: Windows -Requires-Python: >=3.5 +Requires-Python: >=3.7 License-File: LICENSE License-File: LICENSE-GPL3 License-File: LICENSE-GPL2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/PyQt_builder.egg-info/PKG-INFO new/PyQt-builder-1.13.0/PyQt_builder.egg-info/PKG-INFO --- old/PyQt-builder-1.12.2/PyQt_builder.egg-info/PKG-INFO 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/PyQt_builder.egg-info/PKG-INFO 2022-06-17 16:38:05.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: PyQt-builder -Version: 1.12.2 +Version: 1.13.0 Summary: The PEP 517 compliant PyQt build system Home-page: https://www.riverbankcomputing.com/software/pyqt-builder/ Author: Riverbank Computing Limited @@ -9,7 +9,7 @@ Platform: X11 Platform: macOS Platform: Windows -Requires-Python: >=3.5 +Requires-Python: >=3.7 License-File: LICENSE License-File: LICENSE-GPL3 License-File: LICENSE-GPL2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/PyQt_builder.egg-info/SOURCES.txt new/PyQt-builder-1.13.0/PyQt_builder.egg-info/SOURCES.txt --- old/PyQt-builder-1.12.2/PyQt_builder.egg-info/SOURCES.txt 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/PyQt_builder.egg-info/SOURCES.txt 2022-06-17 16:38:05.000000000 +0200 @@ -93,13 +93,9 @@ pyqtbuild/bundle/dlls/msvc-64/vcruntime140.dll pyqtbuild/bundle/dlls/msvc-64/vcruntime140_1.dll pyqtbuild/bundle/dlls/openssl-32/libcrypto-1_1.dll -pyqtbuild/bundle/dlls/openssl-32/libeay32.dll pyqtbuild/bundle/dlls/openssl-32/libssl-1_1.dll -pyqtbuild/bundle/dlls/openssl-32/ssleay32.dll pyqtbuild/bundle/dlls/openssl-64/libcrypto-1_1-x64.dll -pyqtbuild/bundle/dlls/openssl-64/libeay32.dll pyqtbuild/bundle/dlls/openssl-64/libssl-1_1-x64.dll -pyqtbuild/bundle/dlls/openssl-64/ssleay32.dll pyqtbuild/bundle/packages/__init__.py pyqtbuild/bundle/packages/pyqt.py pyqtbuild/bundle/packages/pyqt3d.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/doc/html/_static/documentation_options.js new/PyQt-builder-1.13.0/doc/html/_static/documentation_options.js --- old/PyQt-builder-1.12.2/doc/html/_static/documentation_options.js 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/doc/html/_static/documentation_options.js 2022-06-17 16:38:04.000000000 +0200 @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '1.12.2', + VERSION: '1.13.0', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/doc/html/command_line_tools.html new/PyQt-builder-1.13.0/doc/html/command_line_tools.html --- old/PyQt-builder-1.12.2/doc/html/command_line_tools.html 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/doc/html/command_line_tools.html 2022-06-17 16:38:04.000000000 +0200 @@ -5,7 +5,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Command Line Tools — PyQt-builder v1.12.2 Documentation</title> + <title>Command Line Tools — PyQt-builder v1.13.0 Documentation</title> <link rel="stylesheet" type="text/css" href="_static/pygments.css" /> <link rel="stylesheet" type="text/css" href="_static/riverbank.css" /> @@ -34,7 +34,7 @@ <li class="right" > <a href="introduction.html" title="Introduction" accesskey="P">previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Command Line Tools</a></li> </ul> </div> @@ -166,12 +166,12 @@ <li class="right" > <a href="introduction.html" title="Introduction" >previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Command Line Tools</a></li> </ul> </div> <div class="footer" role="contentinfo"> - © Copyright 2021 Riverbank Computing Limited. + © Copyright 2022 Riverbank Computing Limited. Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 4.2.0. </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/doc/html/example.html new/PyQt-builder-1.13.0/doc/html/example.html --- old/PyQt-builder-1.12.2/doc/html/example.html 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/doc/html/example.html 2022-06-17 16:38:04.000000000 +0200 @@ -5,7 +5,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>An Example — PyQt-builder v1.12.2 Documentation</title> + <title>An Example — PyQt-builder v1.13.0 Documentation</title> <link rel="stylesheet" type="text/css" href="_static/pygments.css" /> <link rel="stylesheet" type="text/css" href="_static/riverbank.css" /> @@ -34,7 +34,7 @@ <li class="right" > <a href="pyqtbuild_api.html" title="pyqtbuild Module Reference" accesskey="P">previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">An Example</a></li> </ul> </div> @@ -166,12 +166,12 @@ <li class="right" > <a href="pyqtbuild_api.html" title="pyqtbuild Module Reference" >previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">An Example</a></li> </ul> </div> <div class="footer" role="contentinfo"> - © Copyright 2021 Riverbank Computing Limited. + © Copyright 2022 Riverbank Computing Limited. Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 4.2.0. </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/doc/html/genindex.html new/PyQt-builder-1.13.0/doc/html/genindex.html --- old/PyQt-builder-1.12.2/doc/html/genindex.html 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/doc/html/genindex.html 2022-06-17 16:38:04.000000000 +0200 @@ -5,7 +5,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Index — PyQt-builder v1.12.2 Documentation</title> + <title>Index — PyQt-builder v1.13.0 Documentation</title> <link rel="stylesheet" type="text/css" href="_static/pygments.css" /> <link rel="stylesheet" type="text/css" href="_static/riverbank.css" /> @@ -26,7 +26,7 @@ <li class="right" > <a href="py-modindex.html" title="Python Module Index" >modules</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Index</a></li> </ul> </div> @@ -368,12 +368,12 @@ <li class="right" > <a href="py-modindex.html" title="Python Module Index" >modules</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Index</a></li> </ul> </div> <div class="footer" role="contentinfo"> - © Copyright 2021 Riverbank Computing Limited. + © Copyright 2022 Riverbank Computing Limited. Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 4.2.0. </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/doc/html/index.html new/PyQt-builder-1.13.0/doc/html/index.html --- old/PyQt-builder-1.12.2/doc/html/index.html 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/doc/html/index.html 2022-06-17 16:38:04.000000000 +0200 @@ -5,7 +5,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Reference Guide — PyQt-builder v1.12.2 Documentation</title> + <title>Reference Guide — PyQt-builder v1.13.0 Documentation</title> <link rel="stylesheet" type="text/css" href="_static/pygments.css" /> <link rel="stylesheet" type="text/css" href="_static/riverbank.css" /> @@ -30,7 +30,7 @@ <li class="right" > <a href="introduction.html" title="Introduction" accesskey="N">next</a> |</li> - <li class="nav-item nav-item-0"><a href="#">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="#">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Reference Guide</a></li> </ul> </div> @@ -109,12 +109,12 @@ <li class="right" > <a href="introduction.html" title="Introduction" >next</a> |</li> - <li class="nav-item nav-item-0"><a href="#">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="#">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Reference Guide</a></li> </ul> </div> <div class="footer" role="contentinfo"> - © Copyright 2021 Riverbank Computing Limited. + © Copyright 2022 Riverbank Computing Limited. Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 4.2.0. </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/doc/html/introduction.html new/PyQt-builder-1.13.0/doc/html/introduction.html --- old/PyQt-builder-1.12.2/doc/html/introduction.html 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/doc/html/introduction.html 2022-06-17 16:38:04.000000000 +0200 @@ -5,7 +5,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Introduction — PyQt-builder v1.12.2 Documentation</title> + <title>Introduction — PyQt-builder v1.13.0 Documentation</title> <link rel="stylesheet" type="text/css" href="_static/pygments.css" /> <link rel="stylesheet" type="text/css" href="_static/riverbank.css" /> @@ -34,7 +34,7 @@ <li class="right" > <a href="index.html" title="Reference Guide" accesskey="P">previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Introduction</a></li> </ul> </div> @@ -129,12 +129,12 @@ <li class="right" > <a href="index.html" title="Reference Guide" >previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Introduction</a></li> </ul> </div> <div class="footer" role="contentinfo"> - © Copyright 2021 Riverbank Computing Limited. + © Copyright 2022 Riverbank Computing Limited. Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 4.2.0. </div> </body> Binary files old/PyQt-builder-1.12.2/doc/html/objects.inv and new/PyQt-builder-1.13.0/doc/html/objects.inv differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/doc/html/py-modindex.html new/PyQt-builder-1.13.0/doc/html/py-modindex.html --- old/PyQt-builder-1.12.2/doc/html/py-modindex.html 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/doc/html/py-modindex.html 2022-06-17 16:38:04.000000000 +0200 @@ -5,7 +5,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Python Module Index — PyQt-builder v1.12.2 Documentation</title> + <title>Python Module Index — PyQt-builder v1.13.0 Documentation</title> <link rel="stylesheet" type="text/css" href="_static/pygments.css" /> <link rel="stylesheet" type="text/css" href="_static/riverbank.css" /> @@ -33,7 +33,7 @@ <li class="right" > <a href="#" title="Python Module Index" >modules</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Python Module Index</a></li> </ul> </div> @@ -91,12 +91,12 @@ <li class="right" > <a href="#" title="Python Module Index" >modules</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Python Module Index</a></li> </ul> </div> <div class="footer" role="contentinfo"> - © Copyright 2021 Riverbank Computing Limited. + © Copyright 2022 Riverbank Computing Limited. Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 4.2.0. </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/doc/html/pyproject_toml.html new/PyQt-builder-1.13.0/doc/html/pyproject_toml.html --- old/PyQt-builder-1.12.2/doc/html/pyproject_toml.html 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/doc/html/pyproject_toml.html 2022-06-17 16:38:04.000000000 +0200 @@ -5,7 +5,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>pyproject.toml Reference — PyQt-builder v1.12.2 Documentation</title> + <title>pyproject.toml Reference — PyQt-builder v1.13.0 Documentation</title> <link rel="stylesheet" type="text/css" href="_static/pygments.css" /> <link rel="stylesheet" type="text/css" href="_static/riverbank.css" /> @@ -34,7 +34,7 @@ <li class="right" > <a href="command_line_tools.html" title="Command Line Tools" accesskey="P">previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href=""><code class="file docutils literal notranslate"><span class="pre">pyproject.toml</span></code> Reference</a></li> </ul> </div> @@ -199,12 +199,12 @@ <li class="right" > <a href="command_line_tools.html" title="Command Line Tools" >previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href=""><code class="file docutils literal notranslate"><span class="pre">pyproject.toml</span></code> Reference</a></li> </ul> </div> <div class="footer" role="contentinfo"> - © Copyright 2021 Riverbank Computing Limited. + © Copyright 2022 Riverbank Computing Limited. Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 4.2.0. </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/doc/html/pyqtbuild_api.html new/PyQt-builder-1.13.0/doc/html/pyqtbuild_api.html --- old/PyQt-builder-1.12.2/doc/html/pyqtbuild_api.html 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/doc/html/pyqtbuild_api.html 2022-06-17 16:38:04.000000000 +0200 @@ -5,7 +5,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>pyqtbuild Module Reference — PyQt-builder v1.12.2 Documentation</title> + <title>pyqtbuild Module Reference — PyQt-builder v1.13.0 Documentation</title> <link rel="stylesheet" type="text/css" href="_static/pygments.css" /> <link rel="stylesheet" type="text/css" href="_static/riverbank.css" /> @@ -34,7 +34,7 @@ <li class="right" > <a href="pyproject_toml.html" title="pyproject.toml Reference" accesskey="P">previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href=""><code class="xref py py-mod docutils literal notranslate"><span class="pre">pyqtbuild</span></code> Module Reference</a></li> </ul> </div> @@ -271,12 +271,12 @@ <li class="right" > <a href="pyproject_toml.html" title="pyproject.toml Reference" >previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href=""><code class="xref py py-mod docutils literal notranslate"><span class="pre">pyqtbuild</span></code> Module Reference</a></li> </ul> </div> <div class="footer" role="contentinfo"> - © Copyright 2021 Riverbank Computing Limited. + © Copyright 2022 Riverbank Computing Limited. Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 4.2.0. </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/doc/html/pyqtbundle.html new/PyQt-builder-1.13.0/doc/html/pyqtbundle.html --- old/PyQt-builder-1.12.2/doc/html/pyqtbundle.html 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/doc/html/pyqtbundle.html 2022-06-17 16:38:04.000000000 +0200 @@ -5,7 +5,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Bundling Qt Using pyqt-bundle — PyQt-builder v1.12.2 Documentation</title> + <title>Bundling Qt Using pyqt-bundle — PyQt-builder v1.13.0 Documentation</title> <link rel="stylesheet" type="text/css" href="_static/pygments.css" /> <link rel="stylesheet" type="text/css" href="_static/riverbank.css" /> @@ -30,7 +30,7 @@ <li class="right" > <a href="example.html" title="An Example" accesskey="P">previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Bundling Qt Using <strong class="program">pyqt-bundle</strong></a></li> </ul> </div> @@ -233,12 +233,12 @@ <li class="right" > <a href="example.html" title="An Example" >previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Bundling Qt Using <strong class="program">pyqt-bundle</strong></a></li> </ul> </div> <div class="footer" role="contentinfo"> - © Copyright 2021 Riverbank Computing Limited. + © Copyright 2022 Riverbank Computing Limited. Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 4.2.0. </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/doc/html/search.html new/PyQt-builder-1.13.0/doc/html/search.html --- old/PyQt-builder-1.12.2/doc/html/search.html 2021-10-28 11:53:19.000000000 +0200 +++ new/PyQt-builder-1.13.0/doc/html/search.html 2022-06-17 16:38:04.000000000 +0200 @@ -5,7 +5,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Search — PyQt-builder v1.12.2 Documentation</title> + <title>Search — PyQt-builder v1.13.0 Documentation</title> <link rel="stylesheet" type="text/css" href="_static/pygments.css" /> <link rel="stylesheet" type="text/css" href="_static/riverbank.css" /> @@ -32,7 +32,7 @@ <li class="right" > <a href="py-modindex.html" title="Python Module Index" >modules</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Search</a></li> </ul> </div> @@ -92,12 +92,12 @@ <li class="right" > <a href="py-modindex.html" title="Python Module Index" >modules</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.12.2 Documentation</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.13.0 Documentation</a> »</li> <li class="nav-item nav-item-this"><a href="">Search</a></li> </ul> </div> <div class="footer" role="contentinfo"> - © Copyright 2021 Riverbank Computing Limited. + © Copyright 2022 Riverbank Computing Limited. Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 4.2.0. </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/pyqtbuild/builder.py new/PyQt-builder-1.13.0/pyqtbuild/builder.py --- old/PyQt-builder-1.12.2/pyqtbuild/builder.py 2021-10-28 11:53:13.000000000 +0200 +++ new/PyQt-builder-1.13.0/pyqtbuild/builder.py 2022-06-17 16:37:55.000000000 +0200 @@ -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 @@ -140,18 +140,13 @@ # Set the default ABI version of the sip module. if not project.abi_version: - # The defaults should really be the .0 versions but we - # originally didn't specify a minor version so that SIP - # defaulted to the latest version it knew about (which may vary - # according to the SIP version). We therefore specify the - # minimum version needed by the current versions of PyQt at the - # time of writing. If later versions of PyQt have different - # requirements then they will explicitly specify the required - # version. + # These are the minimum recommended versions. They usually + # correspond to specific functionality that users would expect + # to be enabled. if project.sip_module == 'PyQt5.sip': - project.abi_version = '12.8' + project.abi_version = '12.11' elif project.sip_module == 'PyQt6.sip': - project.abi_version = '13.1' + project.abi_version = '13.4' super().apply_user_defaults(tool) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/pyqtbuild/bundle/abstract_package.py new/PyQt-builder-1.13.0/pyqtbuild/bundle/abstract_package.py --- old/PyQt-builder-1.12.2/pyqtbuild/bundle/abstract_package.py 2021-10-28 11:53:13.000000000 +0200 +++ new/PyQt-builder-1.13.0/pyqtbuild/bundle/abstract_package.py 2022-06-17 16:37:55.000000000 +0200 @@ -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 @@ -25,7 +25,6 @@ from abc import ABC, abstractmethod import os import packaging -import subprocess from sipbuild import UserException @@ -45,6 +44,11 @@ self.qt_version = self._parse_version( os.path.basename(os.path.dirname(self._qt_dir))) + # We don't support anything older that the current LTS release. + if self.qt_version < (5, 15, 0): + raise UserException( + "Version of Qt older than v5.15 are not supported") + # Parse any package version string. if version_str: self._version = self._parse_version(version_str) @@ -114,18 +118,7 @@ if bindings: # Find the bindings. for ext in module_extensions: - bindings = os.path.join(package_dir, name + ext) - if os.path.isfile(bindings): - if self.qt_version < (5, 15, 0): - # This isn't necessary for newer wheels built with - # '--target-qt-dir' but we still have to handle - # older wheels (ie. using versions of Qt released - # before '--target-qt-dir' was added. - if platform_tag.startswith('manylinux'): - self._fix_linux_rpath(bindings) - elif platform_tag.startswith('macosx'): - self._fix_macos_rpath(bindings) - + if os.path.isfile(os.path.join(package_dir, name + ext)): break else: verbose( @@ -185,60 +178,6 @@ return '.'.join([str(v) for v in self.qt_version]) - @classmethod - def _fix_linux_rpath(cls, bindings): - """ Fix the rpath for Linux bindings. """ - - if cls.missing_executable('chrpath'): - raise UserException("'chrpath' must be installed on your system") - - subprocess.run(['chrpath', '--replace', '$ORIGIN/Qt/lib', bindings]) - - @classmethod - def _fix_macos_rpath(cls, bindings): - """ Fix the rpath for macOS bindings. """ - - if cls.missing_executable('otool') or cls.missing_executable('install_name_tool'): - raise UserException( - "'otool' and 'install_name_tool' from Xcode must be " - "installed on your system") - - # Use otool to get all current rpaths. - pipe = subprocess.Popen('otool -l {}'.format(bindings), shell=True, - stdout=subprocess.PIPE, universal_newlines=True) - - # Delete any existing rpaths. - args = [] - new_rpath = '@loader_path/Qt/lib' - add_new_rpath = True - - for line in pipe.stdout: - parts = line.split() - - if len(parts) >= 2 and parts[0] == 'path': - rpath = parts[1] - - if rpath == new_rpath: - add_new_rpath = False - else: - args.append('-delete_rpath') - args.append(rpath) - - rc = pipe.wait() - if rc != 0: - raise UserException("otool returned a non-zero exit status") - - # Add an rpath for the bundled Qt installation if it is not already - # there. - if add_new_rpath: - args.append('-add_rpath') - args.append('@loader_path/Qt/lib') - - if args: - args.insert(0, 'install_name_tool') - args.append(bindings) - subprocess.run(args) - @staticmethod def _parse_version(version_str): """ Parse a version string as a 3-tuple of major, minor and maintenance Binary files old/PyQt-builder-1.12.2/pyqtbuild/bundle/dlls/openssl-32/libeay32.dll and new/PyQt-builder-1.13.0/pyqtbuild/bundle/dlls/openssl-32/libeay32.dll differ Binary files old/PyQt-builder-1.12.2/pyqtbuild/bundle/dlls/openssl-32/ssleay32.dll and new/PyQt-builder-1.13.0/pyqtbuild/bundle/dlls/openssl-32/ssleay32.dll differ Binary files old/PyQt-builder-1.12.2/pyqtbuild/bundle/dlls/openssl-64/libeay32.dll and new/PyQt-builder-1.13.0/pyqtbuild/bundle/dlls/openssl-64/libeay32.dll differ Binary files old/PyQt-builder-1.12.2/pyqtbuild/bundle/dlls/openssl-64/ssleay32.dll and new/PyQt-builder-1.13.0/pyqtbuild/bundle/dlls/openssl-64/ssleay32.dll differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqt3d.py new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqt3d.py --- old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqt3d.py 2021-10-28 11:53:13.000000000 +0200 +++ new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqt3d.py 2022-06-17 16:37:55.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (c) 2020, 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 @@ -28,33 +28,29 @@ # The Qt meta-data for this package. _QT_METADATA = { - # Although Qt3D was actually added in Qt v5.6 it wasn't supported by PyQt - # until v5.7. 'Qt3DAnimation': - VersionedMetadata(version=(5, 10, 0), + VersionedMetadata( lib_deps={'': ('Qt3DQuickAnimation', )}), 'Qt3DCore': - VersionedMetadata(version=(5, 7, 0), + VersionedMetadata( lib_deps={'': ('Qt3DQuick', )}, qml=True, qml_names=('Qt3D', )), 'Qt3DExtras': - VersionedMetadata(version=(5, 7, 0), + VersionedMetadata( lib_deps={'': ('Qt3DQuickExtras', )}), - 'Qt3DInput': ( - VersionedMetadata(version=(5, 7, 1), + 'Qt3DInput': + VersionedMetadata( lib_deps={'': ('Qt3DQuickInput', 'QtGamepad')}), - VersionedMetadata(version=(5, 7, 0), - lib_deps={'': ('Qt3DQuickInput', )})), 'Qt3DLogic': - VersionedMetadata(version=(5, 7, 0)), + VersionedMetadata(), 'Qt3DRender': - VersionedMetadata(version=(5, 7, 0), + VersionedMetadata( lib_deps={ 'win': ('QtConcurrent', ), '': ('Qt3DQuickRender', 'Qt3DQuickScene2D')}), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqt5.py new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqt5.py --- old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqt5.py 2021-10-28 11:53:13.000000000 +0200 +++ new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqt5.py 2022-06-17 16:37:55.000000000 +0200 @@ -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 @@ -41,15 +41,12 @@ 'QtAndroidExtras': VersionedMetadata(), - 'QtBluetooth': ( - VersionedMetadata(version=(5, 7, 1), + 'QtBluetooth': + VersionedMetadata( lib_deps={ 'linux': ('QtConcurrent', ), 'macos': ('QtConcurrent', )}, qml=True), - VersionedMetadata( - lib_deps={'macos': ('QtConcurrent', )}, - qml=True)), 'QtCore': VersionedMetadata( @@ -70,29 +67,27 @@ VersionedMetadata(), 'QtGui': - VersionedMetadata(lib_deps={'linux': ('QtWaylandClient', 'QtXcbQpa')}, - other_lib_deps={ - 'win': ('d3dcompiler_47.dll', 'libEGL.dll', - 'libGLESv2.dll', 'opengl32sw.dll')}), - - 'QtHelp': ( - VersionedMetadata(version=(5, 9, 0)), - VersionedMetadata(lib_deps={'': ('QtCLucene', )})), - - 'QtLocation': ( - VersionedMetadata(version=(5, 11, 0), qml=True, - lib_deps={'': ('QtPositioningQuick', )}), - VersionedMetadata(qml=True)), + VersionedMetadata( + lib_deps={'linux': ('QtWaylandClient', 'QtXcbQpa')}, + other_lib_deps={ + 'win': ('d3dcompiler_47.dll', 'libEGL.dll', 'libGLESv2.dll', + 'opengl32sw.dll')}), + + 'QtHelp': + VersionedMetadata(), + + 'QtLocation': + VersionedMetadata( + lib_deps={'': ('QtPositioningQuick', )}, + qml=True), 'QtMacExtras': VersionedMetadata(), - 'QtMultimedia': ( - VersionedMetadata(version=(5, 10, 0), - lib_deps={'linux': ('QtMultimediaGstTools', )}, - qml=True, qml_names=('QtAudioEngine', 'QtMultimedia')), - VersionedMetadata(lib_deps={'win': ('QtMultimediaQuick_p', )}, - qml=True, qml_names=('QtAudioEngine', 'QtMultimedia'))), + 'QtMultimedia': + VersionedMetadata( + lib_deps={'linux': ('QtMultimediaGstTools', )}, + qml=True, qml_names=('QtAudioEngine', 'QtMultimedia')), 'QtMultimediaWidgets': VersionedMetadata(), @@ -101,7 +96,7 @@ VersionedMetadata(), 'QtNetworkAuth': - VersionedMetadata(version=(5, 10, 0), legacy=True), + VersionedMetadata(legacy=True), 'QtNfc': VersionedMetadata(qml=True), @@ -115,32 +110,31 @@ 'QtPrintSupport': VersionedMetadata(), - 'QtQml': ( - VersionedMetadata(version=(5, 14, 0), - lib_deps={'': ('QtQmlModels', 'QtQmlWorkerScript')}, - qml=True), - VersionedMetadata(qml=True)), + 'QtQml': + VersionedMetadata( + lib_deps={'': ('QtQmlModels', 'QtQmlWorkerScript')}, + qml=True), 'QtQuick': VersionedMetadata( - lib_deps={'': ('QtQuickControls2', 'QtQuickParticles', - 'QtQuickShapes', 'QtQuickTemplates2', 'QtQuickTest')}, - qml=True, - qml_names=('QtCanvas3D', 'QtGraphicalEffects', 'QtQuick', - 'QtQuick.2')), + lib_deps={'': ('QtQuickControls2', 'QtQuickParticles', + 'QtQuickShapes', 'QtQuickTemplates2', 'QtQuickTest')}, + qml=True, + qml_names=('QtCanvas3D', 'QtGraphicalEffects', 'QtQuick', + 'QtQuick.2')), 'QtQuick3D': - VersionedMetadata(version=(5, 15, 0), - lib_deps={ - '': ('QtQuick3DAssetImport', 'QtQuick3DRender', - 'QtQuick3DRuntimeRender', 'QtQuick3DUtils')}, - qml=True), + VersionedMetadata( + lib_deps={ + '': ('QtQuick3DAssetImport', 'QtQuick3DRender', + 'QtQuick3DRuntimeRender', 'QtQuick3DUtils')}, + qml=True), 'QtQuickWidgets': VersionedMetadata(), 'QtRemoteObjects': - VersionedMetadata(version=(5, 12, 0), qml=True), + VersionedMetadata(qml=True), 'QtSensors': VersionedMetadata(qml=True), @@ -158,7 +152,7 @@ VersionedMetadata(qml=True), 'QtTextToSpeech': - VersionedMetadata(version=(5, 15, 0)), + VersionedMetadata(), 'QtWebChannel': VersionedMetadata(qml=True), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqt6_webengine.py new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqt6_webengine.py --- old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqt6_webengine.py 2021-10-28 11:53:13.000000000 +0200 +++ new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqt6_webengine.py 2022-06-17 16:37:55.000000000 +0200 @@ -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 @@ -30,6 +30,7 @@ _QT_METADATA = { 'QtWebEngineCore': VersionedMetadata(version=(6, 2, 0), + translations=('qtwebengine', ), other_lib_deps={ 'macos': ('QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Info.plist', )}, exes={ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqtchart.py new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqtchart.py --- old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqtchart.py 2021-10-28 11:53:13.000000000 +0200 +++ new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqtchart.py 2022-06-17 16:37:55.000000000 +0200 @@ -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 @@ -29,8 +29,7 @@ # The Qt meta-data for this package. _QT_METADATA = { 'QtChart': - VersionedMetadata(version=(5, 7, 0), name='QtCharts', qml=True, - lgpl=False), + VersionedMetadata(name='QtCharts', qml=True, lgpl=False), } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqtdatavisualization.py new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqtdatavisualization.py --- old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqtdatavisualization.py 2021-10-28 11:53:13.000000000 +0200 +++ new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqtdatavisualization.py 2022-06-17 16:37:55.000000000 +0200 @@ -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 @@ -29,8 +29,7 @@ # The Qt meta-data for this package. _QT_METADATA = { 'QtDataVisualization': - VersionedMetadata(version=(5, 7, 0), - qml=True, lgpl=False), + VersionedMetadata(qml=True, lgpl=False), } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqtnetworkauth.py new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqtnetworkauth.py --- old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqtnetworkauth.py 2021-10-28 11:53:13.000000000 +0200 +++ new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqtnetworkauth.py 2022-06-17 16:37:55.000000000 +0200 @@ -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 @@ -29,8 +29,7 @@ # The Qt meta-data for this package. _QT_METADATA = { 'QtNetworkAuth': - VersionedMetadata(version=(5, 10, 0), - lgpl=False), + VersionedMetadata(lgpl=False), } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqtpurchasing.py new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqtpurchasing.py --- old/PyQt-builder-1.12.2/pyqtbuild/bundle/packages/pyqtpurchasing.py 2021-10-28 11:53:13.000000000 +0200 +++ new/PyQt-builder-1.13.0/pyqtbuild/bundle/packages/pyqtpurchasing.py 2022-06-17 16:37:55.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (c) 2020, 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 @@ -29,8 +29,7 @@ # The Qt meta-data for this package. _QT_METADATA = { 'QtPurchasing': - VersionedMetadata(version=(5, 7, 0), - qml=True), + VersionedMetadata(qml=True), } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/pyqtbuild/bundle/qt_metadata.py new/PyQt-builder-1.13.0/pyqtbuild/bundle/qt_metadata.py --- old/PyQt-builder-1.12.2/pyqtbuild/bundle/qt_metadata.py 2021-10-28 11:53:14.000000000 +0200 +++ new/PyQt-builder-1.13.0/pyqtbuild/bundle/qt_metadata.py 2022-06-17 16:37:55.000000000 +0200 @@ -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 @@ -303,10 +303,6 @@ # Note that this assumes the executable is QtWebEngineProcess. - if qt_version == (5, 6, 0): - # Replace the incorrect rpath with the correct one. - subprocess.run(['chrpath', '--replace', '$ORIGIN/../lib', exe]) - cls._create_qt_conf(exe) @classmethod @@ -315,33 +311,22 @@ # Note that this assumes the executable is QtWebEngineProcess. - if qt_version == (5, 6, 0): - # The rpaths were completly broken in this version. - subprocess.run(['install_name_tool', '-delete_rpath', - '@loader_path/../../../../../../../../Frameworks', exe]) - subprocess.run(['install_name_tool', '-delete_rpath', - '/Users/qt/work/install/lib', exe]) - - subprocess.run(['install_name_tool', '-add_rpath', - '@loader_path/../../../../../', exe]) - else: - # pip doesn't support symbolic links in wheels so the executable - # will be installed in its 'logical' location so adjust rpath so - # that it can still find the Qt libraries. The required change is - # simple so we just patch the binary rather than require - # install_name_tool. Note that install_name_tool is now always - # needed anyway. - with open(exe, 'rb') as f: - contents = f.read() + # pip doesn't support symbolic links in wheels so the executable will + # be installed in its 'logical' location so adjust rpath so that it can + # still find the Qt libraries. The required change is simple so we + # just patch the binary rather than require install_name_tool. Note + # that install_name_tool is now always needed anyway. + with open(exe, 'rb') as f: + contents = f.read() - contents = contents.replace(b'@loader_path/../../../../../../../', - b'@loader_path/../../../../../\0\0\0\0\0\0') + contents = contents.replace(b'@loader_path/../../../../../../../', + b'@loader_path/../../../../../\0\0\0\0\0\0') - with open(exe, 'wb') as f: - f.write(contents) + with open(exe, 'wb') as f: + f.write(contents) - if macos_thin_arch == 'arm64': - subprocess.run(['codesign', '-s', '-', exe]) + if macos_thin_arch == 'arm64': + subprocess.run(['codesign', '-s', '-', exe]) @classmethod def _fix_win_executable(cls, exe): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/pyqtbuild/version.py new/PyQt-builder-1.13.0/pyqtbuild/version.py --- old/PyQt-builder-1.12.2/pyqtbuild/version.py 2021-10-28 11:53:18.000000000 +0200 +++ new/PyQt-builder-1.13.0/pyqtbuild/version.py 2022-06-17 16:38:03.000000000 +0200 @@ -1,2 +1,2 @@ -PYQTBUILD_VERSION = 0x010c02 -PYQTBUILD_VERSION_STR = '1.12.2' +PYQTBUILD_VERSION = 0x010d00 +PYQTBUILD_VERSION_STR = '1.13.0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.12.2/setup.py new/PyQt-builder-1.13.0/setup.py --- old/PyQt-builder-1.12.2/setup.py 2021-10-28 11:53:13.000000000 +0200 +++ new/PyQt-builder-1.13.0/setup.py 2022-06-17 16:37:55.000000000 +0200 @@ -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 @@ -48,7 +48,7 @@ name='PyQt-builder', version=version, license='SIP', - python_requires='>=3.5', + python_requires='>=3.7', install_requires=['packaging', 'sip >=6.3, <7'], packages=find_packages(), package_data={