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 2021-03-16 15:43:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyqt-builder (Old) and /work/SRC/openSUSE:Factory/.python-pyqt-builder.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyqt-builder" Tue Mar 16 15:43:33 2021 rev:5 rq:878416 version:1.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyqt-builder/python-pyqt-builder.changes 2021-03-05 13:44:39.243588255 +0100 +++ /work/SRC/openSUSE:Factory/.python-pyqt-builder.new.2401/python-pyqt-builder.changes 2021-03-16 15:45:14.973118339 +0100 @@ -1,0 +2,7 @@ +Thu Mar 11 19:48:31 UTC 2021 - Ben Greiner <c...@bnavigator.de> + +- Update to version 1.9.1 + * Handle the changed Qt installation directory used by PyQt5 + v5.15.4 and later, and PyQt6 v6.0.3 and later. + +------------------------------------------------------------------- Old: ---- PyQt-builder-1.9.0.tar.gz New: ---- PyQt-builder-1.9.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyqt-builder.spec ++++++ --- /var/tmp/diff_new_pack.oAGWOm/_old 2021-03-16 15:45:17.329122109 +0100 +++ /var/tmp/diff_new_pack.oAGWOm/_new 2021-03-16 15:45:17.333122116 +0100 @@ -20,7 +20,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-%{mname} -Version: 1.9.0 +Version: 1.9.1 Release: 0 Summary: The PEP 517 compliant PyQt build system License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP ++++++ PyQt-builder-1.9.0.tar.gz -> PyQt-builder-1.9.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/ChangeLog new/PyQt-builder-1.9.1/ChangeLog --- old/PyQt-builder-1.9.0/ChangeLog 2021-02-22 18:52:29.000000000 +0100 +++ new/PyQt-builder-1.9.1/ChangeLog 2021-03-04 18:12:20.000000000 +0100 @@ -1,5 +1,29 @@ +2021-03-02 Phil Thompson <p...@riverbankcomputing.com> + + * NEWS: + Released as v1.9.1. + [99dbf7f8c33c] [1.9.1] <1.9-maint> + + * pyqtbuild/bundle/qt_wheel.py, + pyqtbuild/bundle/qt_wheel_distinfo/METADATA: + Fixed the name in the meta-data of a Qt wheel. + [5ce175b51818] <1.9-maint> + + * pyqtbuild/bundle/qt_wheel.py: + Fixed the name of a Qt wheel. + [b4be05cac0d6] <1.9-maint> + + * NEWS, pyqtbuild/bundle/abstract_package.py: + Handle the changed Qt installation directory used in newer PyQt + releases. + [ef7fa24f4c28] <1.9-maint> + 2021-02-22 Phil Thompson <p...@riverbankcomputing.com> + * .hgtags: + Added tag 1.9.0 for changeset de8775a53a87 + [82511d30da8f] + * NEWS: Released as v1.9.0. [de8775a53a87] [1.9.0] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/NEWS new/PyQt-builder-1.9.1/NEWS --- old/PyQt-builder-1.9.0/NEWS 2021-02-22 18:52:26.000000000 +0100 +++ new/PyQt-builder-1.9.1/NEWS 2021-03-04 18:12:17.000000000 +0100 @@ -1,3 +1,7 @@ +v1.9.1 2nd March 2021 + - Handle the changed Qt installation directory used by PyQt5 v5.15.4 and + later, and PyQt6 v6.0.3 and later. + v1.9.0 23rd February 2021 - Added support for PyQtNetworkAuth. - Added support for creating Qt5 wheels. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/PKG-INFO new/PyQt-builder-1.9.1/PKG-INFO --- old/PyQt-builder-1.9.0/PKG-INFO 2021-02-22 18:52:30.000000000 +0100 +++ new/PyQt-builder-1.9.1/PKG-INFO 2021-03-04 18:12:20.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: PyQt-builder -Version: 1.9.0 +Version: 1.9.1 Summary: The PEP 517 compliant PyQt build system Home-page: https://www.riverbankcomputing.com/software/pyqt/ Author: Riverbank Computing Limited diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/PyQt_builder.egg-info/PKG-INFO new/PyQt-builder-1.9.1/PyQt_builder.egg-info/PKG-INFO --- old/PyQt-builder-1.9.0/PyQt_builder.egg-info/PKG-INFO 2021-02-22 18:52:29.000000000 +0100 +++ new/PyQt-builder-1.9.1/PyQt_builder.egg-info/PKG-INFO 2021-03-04 18:12:20.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: PyQt-builder -Version: 1.9.0 +Version: 1.9.1 Summary: The PEP 517 compliant PyQt build system Home-page: https://www.riverbankcomputing.com/software/pyqt/ Author: Riverbank Computing Limited diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/doc/html/_static/documentation_options.js new/PyQt-builder-1.9.1/doc/html/_static/documentation_options.js --- old/PyQt-builder-1.9.0/doc/html/_static/documentation_options.js 2021-02-22 18:52:28.000000000 +0100 +++ new/PyQt-builder-1.9.1/doc/html/_static/documentation_options.js 2021-03-04 18:12:19.000000000 +0100 @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '1.9.0', + VERSION: '1.9.1', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/doc/html/command_line_tools.html new/PyQt-builder-1.9.1/doc/html/command_line_tools.html --- old/PyQt-builder-1.9.0/doc/html/command_line_tools.html 2021-02-22 18:52:28.000000000 +0100 +++ new/PyQt-builder-1.9.1/doc/html/command_line_tools.html 2021-03-04 18:12:19.000000000 +0100 @@ -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.9.0 Reference Guide</title> + <title>Command Line Tools — PyQt-builder v1.9.1 Reference Guide</title> <link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/riverbank.css" type="text/css" /> @@ -35,7 +35,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Command Line Tools</a></li> </ul> </div> @@ -170,7 +170,7 @@ <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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Command Line Tools</a></li> </ul> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/doc/html/example.html new/PyQt-builder-1.9.1/doc/html/example.html --- old/PyQt-builder-1.9.0/doc/html/example.html 2021-02-22 18:52:28.000000000 +0100 +++ new/PyQt-builder-1.9.1/doc/html/example.html 2021-03-04 18:12:19.000000000 +0100 @@ -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.9.0 Reference Guide</title> + <title>An Example — PyQt-builder v1.9.1 Reference Guide</title> <link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/riverbank.css" type="text/css" /> @@ -35,7 +35,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">An Example</a></li> </ul> </div> @@ -170,7 +170,7 @@ <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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">An Example</a></li> </ul> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/doc/html/genindex.html new/PyQt-builder-1.9.1/doc/html/genindex.html --- old/PyQt-builder-1.9.0/doc/html/genindex.html 2021-02-22 18:52:28.000000000 +0100 +++ new/PyQt-builder-1.9.1/doc/html/genindex.html 2021-03-04 18:12:19.000000000 +0100 @@ -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.9.0 Reference Guide</title> + <title>Index — PyQt-builder v1.9.1 Reference Guide</title> <link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/riverbank.css" type="text/css" /> @@ -27,7 +27,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Index</a></li> </ul> </div> @@ -363,7 +363,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Index</a></li> </ul> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/doc/html/index.html new/PyQt-builder-1.9.1/doc/html/index.html --- old/PyQt-builder-1.9.0/doc/html/index.html 2021-02-22 18:52:28.000000000 +0100 +++ new/PyQt-builder-1.9.1/doc/html/index.html 2021-03-04 18:12:19.000000000 +0100 @@ -5,7 +5,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>PyQt-builder Reference Guide — PyQt-builder v1.9.0 Reference Guide</title> + <title>PyQt-builder Reference Guide — PyQt-builder v1.9.1 Reference Guide</title> <link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/riverbank.css" type="text/css" /> @@ -31,7 +31,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="#">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">PyQt-builder Reference Guide</a></li> </ul> </div> @@ -113,7 +113,7 @@ <li class="right" > <a href="introduction.html" title="Introduction" >next</a> |</li> - <li class="nav-item nav-item-0"><a href="#">PyQt-builder v1.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="#">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">PyQt-builder Reference Guide</a></li> </ul> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/doc/html/introduction.html new/PyQt-builder-1.9.1/doc/html/introduction.html --- old/PyQt-builder-1.9.0/doc/html/introduction.html 2021-02-22 18:52:28.000000000 +0100 +++ new/PyQt-builder-1.9.1/doc/html/introduction.html 2021-03-04 18:12:19.000000000 +0100 @@ -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.9.0 Reference Guide</title> + <title>Introduction — PyQt-builder v1.9.1 Reference Guide</title> <link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/riverbank.css" type="text/css" /> @@ -35,7 +35,7 @@ <li class="right" > <a href="index.html" title="PyQt-builder Reference Guide" accesskey="P">previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Introduction</a></li> </ul> </div> @@ -133,7 +133,7 @@ <li class="right" > <a href="index.html" title="PyQt-builder Reference Guide" >previous</a> |</li> - <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Introduction</a></li> </ul> </div> Binary files old/PyQt-builder-1.9.0/doc/html/objects.inv and new/PyQt-builder-1.9.1/doc/html/objects.inv differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/doc/html/py-modindex.html new/PyQt-builder-1.9.1/doc/html/py-modindex.html --- old/PyQt-builder-1.9.0/doc/html/py-modindex.html 2021-02-22 18:52:28.000000000 +0100 +++ new/PyQt-builder-1.9.1/doc/html/py-modindex.html 2021-03-04 18:12:19.000000000 +0100 @@ -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.9.0 Reference Guide</title> + <title>Python Module Index — PyQt-builder v1.9.1 Reference Guide</title> <link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/riverbank.css" type="text/css" /> @@ -34,7 +34,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Python Module Index</a></li> </ul> </div> @@ -95,7 +95,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Python Module Index</a></li> </ul> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/doc/html/pyproject_toml.html new/PyQt-builder-1.9.1/doc/html/pyproject_toml.html --- old/PyQt-builder-1.9.0/doc/html/pyproject_toml.html 2021-02-22 18:52:28.000000000 +0100 +++ new/PyQt-builder-1.9.1/doc/html/pyproject_toml.html 2021-03-04 18:12:19.000000000 +0100 @@ -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.9.0 Reference Guide</title> + <title>pyproject.toml Reference — PyQt-builder v1.9.1 Reference Guide</title> <link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/riverbank.css" type="text/css" /> @@ -35,7 +35,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</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> @@ -203,7 +203,7 @@ <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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/doc/html/pyqtbuild_api.html new/PyQt-builder-1.9.1/doc/html/pyqtbuild_api.html --- old/PyQt-builder-1.9.0/doc/html/pyqtbuild_api.html 2021-02-22 18:52:28.000000000 +0100 +++ new/PyQt-builder-1.9.1/doc/html/pyqtbuild_api.html 2021-03-04 18:12:19.000000000 +0100 @@ -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.9.0 Reference Guide</title> + <title>pyqtbuild Module Reference — PyQt-builder v1.9.1 Reference Guide</title> <link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/riverbank.css" type="text/css" /> @@ -35,7 +35,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</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> @@ -275,7 +275,7 @@ <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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/doc/html/pyqtbundle.html new/PyQt-builder-1.9.1/doc/html/pyqtbundle.html --- old/PyQt-builder-1.9.0/doc/html/pyqtbundle.html 2021-02-22 18:52:28.000000000 +0100 +++ new/PyQt-builder-1.9.1/doc/html/pyqtbundle.html 2021-03-04 18:12:19.000000000 +0100 @@ -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.9.0 Reference Guide</title> + <title>Bundling Qt Using pyqt-bundle — PyQt-builder v1.9.1 Reference Guide</title> <link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/riverbank.css" type="text/css" /> @@ -31,7 +31,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Bundling Qt Using <strong class="program">pyqt-bundle</strong></a></li> </ul> </div> @@ -224,7 +224,7 @@ <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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Bundling Qt Using <strong class="program">pyqt-bundle</strong></a></li> </ul> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/doc/html/search.html new/PyQt-builder-1.9.1/doc/html/search.html --- old/PyQt-builder-1.9.0/doc/html/search.html 2021-02-22 18:52:28.000000000 +0100 +++ new/PyQt-builder-1.9.1/doc/html/search.html 2021-03-04 18:12:19.000000000 +0100 @@ -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.9.0 Reference Guide</title> + <title>Search — PyQt-builder v1.9.1 Reference Guide</title> <link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/riverbank.css" type="text/css" /> @@ -33,7 +33,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Search</a></li> </ul> </div> @@ -87,7 +87,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.9.0 Reference Guide</a> »</li> + <li class="nav-item nav-item-0"><a href="index.html">PyQt-builder v1.9.1 Reference Guide</a> »</li> <li class="nav-item nav-item-this"><a href="">Search</a></li> </ul> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/pyqtbuild/bundle/abstract_package.py new/PyQt-builder-1.9.1/pyqtbuild/bundle/abstract_package.py --- old/PyQt-builder-1.9.0/pyqtbuild/bundle/abstract_package.py 2021-02-22 18:52:26.000000000 +0100 +++ new/PyQt-builder-1.9.1/pyqtbuild/bundle/abstract_package.py 2021-03-04 18:12:17.000000000 +0100 @@ -47,18 +47,20 @@ # Parse any package version string. if version_str: - version = self._parse_version(version_str) + self._version = self._parse_version(version_str) # If we set the maintenance number to 0 then this will be the # version of Qt the wheel was built against. (This is not a valid # assumption on Windows because of the QAxContainer problem but # this is handled elsewhere.) - min_qt_version = (version[0], version[1], 0) + min_qt_version = (self._version[0], self._version[1], 0) # Check the versions are compatible. if self.qt_version < min_qt_version: raise UserException( "The version of Qt being bundled is too old") + else: + self._version = None def bundle_msvc_runtime(self, target_qt_dir, arch): """ Bundle the MSVC runtime. """ @@ -154,7 +156,18 @@ bundled Qt directory. """ - return os.path.join('PyQt{}'.format(self.qt_version[0]), 'Qt') + # Assume the current naming of the bundled Qt directory. + qt_major_version = self.qt_version[0] + + # See if it is an older version. + if self._version is not None: + if (6, 0, 0) <= self._version <= (6, 0, 2): + qt_major_version = '' + elif self._version <= (5, 15, 3): + qt_major_version = '' + + return os.path.join('PyQt{}'.format(qt_major_version), + 'Qt{}'.format(qt_major_version)) @property def qt_version_str(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/pyqtbuild/bundle/qt_wheel.py new/PyQt-builder-1.9.1/pyqtbuild/bundle/qt_wheel.py --- old/PyQt-builder-1.9.0/pyqtbuild/bundle/qt_wheel.py 2021-02-22 18:52:27.000000000 +0100 +++ new/PyQt-builder-1.9.1/pyqtbuild/bundle/qt_wheel.py 2021-03-04 18:12:17.000000000 +0100 @@ -72,7 +72,7 @@ tag = '-'.join(tag_parts) # Construct the name of the wheel. - name_parts = [package_name + '_Qt'] + name_parts = [package_name + '_Qt' + package.qt_version_str[0]] name_parts.append(package.qt_version_str) distinfo_dir = '-'.join(name_parts) + '.dist-info' @@ -119,6 +119,8 @@ metadata = s.read() metadata = metadata.replace('@RB_PACKAGE@', package_title) + metadata = metadata.replace('@RB_MAJOR_VERSION@', + package.qt_version_str[0]) metadata = metadata.replace('@RB_VERSION@', package.qt_version_str) metadata = metadata.replace('@RB_LICENSE@', "LGPL v3" if lgpl else "GPL v3") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/pyqtbuild/bundle/qt_wheel_distinfo/METADATA new/PyQt-builder-1.9.1/pyqtbuild/bundle/qt_wheel_distinfo/METADATA --- old/PyQt-builder-1.9.0/pyqtbuild/bundle/qt_wheel_distinfo/METADATA 2021-02-22 18:52:27.000000000 +0100 +++ new/PyQt-builder-1.9.1/pyqtbuild/bundle/qt_wheel_distinfo/METADATA 2021-03-04 18:12:17.000000000 +0100 @@ -1,5 +1,5 @@ Metadata-Version: 2.1 -Name: @RB_PACKAGE@-Qt +Name: @RB_PACKAGE@-Qt@RB_MAJOR_VERSION@ Version: @RB_VERSION@ Summary: The subset of a Qt installation needed by @RB_PACKAGE@. Home-page: https://www.riverbankcomputing.com/software/pyqt/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt-builder-1.9.0/pyqtbuild/version.py new/PyQt-builder-1.9.1/pyqtbuild/version.py --- old/PyQt-builder-1.9.0/pyqtbuild/version.py 2021-02-22 18:52:27.000000000 +0100 +++ new/PyQt-builder-1.9.1/pyqtbuild/version.py 2021-03-04 18:12:18.000000000 +0100 @@ -1,2 +1,2 @@ -PYQTBUILD_VERSION = 0x010900 -PYQTBUILD_VERSION_STR = '1.9.0' +PYQTBUILD_VERSION = 0x010901 +PYQTBUILD_VERSION_STR = '1.9.1'