[neon/forks/pyqt-builder/Neon/release] /: New upstream version 1.10.3+dfsg
Dmitry Shachnev
null at kde.org
Tue Sep 28 11:41:21 BST 2021
Git commit 1825b700830dbf07d84b0db02ba754045f5a6203 by Dmitry Shachnev.
Committed on 05/07/2021 at 15:22.
Pushed by jriddell into branch 'Neon/release'.
New upstream version 1.10.3+dfsg
M +34 -1 ChangeLog
M +6 -0 NEWS
M +7 -8 PKG-INFO
M +7 -8 PyQt_builder.egg-info/PKG-INFO
M +5 -6 README
M +1 -1 doc/conf.py
M +2 -2 doc/index.rst
M +2 -2 pyqtbuild/bundle/packages/pyqt6.py
M +1 -1 pyqtbuild/bundle/qt_wheel.py
M +2 -2 pyqtbuild/version.py
M +1 -1 setup.cfg
https://invent.kde.org/neon/forks/pyqt-builder/commit/1825b700830dbf07d84b0db02ba754045f5a6203
diff --git a/ChangeLog b/ChangeLog
index 1b415ab..704b2b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,41 @@
+2021-07-04 Phil Thompson <phil at riverbankcomputing.com>
+
+ * .hgtags:
+ Added tag 1.10.3 for changeset a5437106d445
+ [8b4126f4e0c2] [tip] <1.10-maint>
+
+ * NEWS, pyqtbuild/bundle/qt_wheel.py:
+ Handle the change in the name of the Qt architecture for macOS in Qt
+ v6.1.2.
+ [a5437106d445] [1.10.3] <1.10-maint>
+
+ * .hgtags:
+ Added tag 1.10.2 for changeset 5e954acdcd2b
+ [8d2dbe6e75c0] <1.10-maint>
+
+2021-06-23 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS, pyqtbuild/bundle/packages/pyqt6.py:
+ Bundle the QtQuickLayouts library.
+ [5e954acdcd2b] [1.10.2] <1.10-maint>
+
+2021-06-21 Phil Thompson <phil at riverbankcomputing.com>
+
+ * README, setup.cfg:
+ Fixes to the README and meta-data.
+ [2b5944870fef] <1.10-maint>
+
+2021-06-20 Phil Thompson <phil at riverbankcomputing.com>
+
+ * doc/conf.py, doc/index.rst:
+ Tweaked the documentation title.
+ [8080d24b2d87] <1.10-maint>
+
2021-06-08 Phil Thompson <phil at riverbankcomputing.com>
* .hgtags:
Added tag 1.10.1 for changeset 8686906e1af7
- [cd2073872d3d] [tip] <1.10-maint>
+ [cd2073872d3d] <1.10-maint>
2021-05-13 Phil Thompson <phil at riverbankcomputing.com>
diff --git a/NEWS b/NEWS
index 0c11770..0689340 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+v1.10.3 4th July 2021
+ - A bug fix release.
+
+v1.10.2 23rd June 2021
+ - A bug fix release.
+
v1.10.1 13th May 2021
- The default sip module ABI version is now the minimum required by current
PyQt versions rather than the latest available from SIP.
diff --git a/PKG-INFO b/PKG-INFO
index bcf734b..1080c53 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,8 +1,8 @@
Metadata-Version: 1.2
Name: PyQt-builder
-Version: 1.10.1
+Version: 1.10.3
Summary: The PEP 517 compliant PyQt build system
-Home-page: https://www.riverbankcomputing.com/software/pyqt/
+Home-page: https://www.riverbankcomputing.com/software/pyqt-builder/
Author: Riverbank Computing Limited
Author-email: info at riverbankcomputing.com
License: SIP
@@ -13,7 +13,7 @@ Description: PyQt-builder - The PEP 517 Compliant PyQt Build System
---------------------
PyQt-builder is the PEP 517 compliant build system for PyQt and projects that
- extend PyQt. It extends the sip build system and uses Qt's ``qmake`` to
+ extend PyQt. It extends the SIP build system and uses Qt's ``qmake`` to
perform the actual compilation and installation of extension modules.
Projects that use PyQt-builder provide an appropriate ``pyproject.toml`` file
@@ -26,7 +26,7 @@ Description: PyQt-builder - The PEP 517 Compliant PyQt Build System
------
PyQt-builder is copyright (c) Riverbank Computing Limited. Its homepage is
- https://www.riverbankcomputing.com/software/pyqt/.
+ https://www.riverbankcomputing.com/software/pyqt-builder/.
Support may be obtained from the PyQt mailing list at
https://www.riverbankcomputing.com/mailman/listinfo/pyqt/.
@@ -35,7 +35,7 @@ Description: PyQt-builder - The PEP 517 Compliant PyQt Build System
License
-------
- PyQt-builder is released under the BSD license.
+ PyQt-builder is released under the same licenses as SIP.
Installation
@@ -52,9 +52,8 @@ Description: PyQt-builder - The PEP 517 Compliant PyQt Build System
Documentation
-------------
- The documentation for the latest release is part of the
- `PyQt5 <https://www.riverbankcomputing.com/static/Docs/PyQt5/>`__
- documentation.
+ The documentation for the latest release can be found
+ `here <https://www.riverbankcomputing.com/static/Docs/PyQt-builder/>`__.
Platform: X11
Platform: macOS
diff --git a/PyQt_builder.egg-info/PKG-INFO b/PyQt_builder.egg-info/PKG-INFO
index bcf734b..1080c53 100644
--- a/PyQt_builder.egg-info/PKG-INFO
+++ b/PyQt_builder.egg-info/PKG-INFO
@@ -1,8 +1,8 @@
Metadata-Version: 1.2
Name: PyQt-builder
-Version: 1.10.1
+Version: 1.10.3
Summary: The PEP 517 compliant PyQt build system
-Home-page: https://www.riverbankcomputing.com/software/pyqt/
+Home-page: https://www.riverbankcomputing.com/software/pyqt-builder/
Author: Riverbank Computing Limited
Author-email: info at riverbankcomputing.com
License: SIP
@@ -13,7 +13,7 @@ Description: PyQt-builder - The PEP 517 Compliant PyQt Build System
---------------------
PyQt-builder is the PEP 517 compliant build system for PyQt and projects that
- extend PyQt. It extends the sip build system and uses Qt's ``qmake`` to
+ extend PyQt. It extends the SIP build system and uses Qt's ``qmake`` to
perform the actual compilation and installation of extension modules.
Projects that use PyQt-builder provide an appropriate ``pyproject.toml`` file
@@ -26,7 +26,7 @@ Description: PyQt-builder - The PEP 517 Compliant PyQt Build System
------
PyQt-builder is copyright (c) Riverbank Computing Limited. Its homepage is
- https://www.riverbankcomputing.com/software/pyqt/.
+ https://www.riverbankcomputing.com/software/pyqt-builder/.
Support may be obtained from the PyQt mailing list at
https://www.riverbankcomputing.com/mailman/listinfo/pyqt/.
@@ -35,7 +35,7 @@ Description: PyQt-builder - The PEP 517 Compliant PyQt Build System
License
-------
- PyQt-builder is released under the BSD license.
+ PyQt-builder is released under the same licenses as SIP.
Installation
@@ -52,9 +52,8 @@ Description: PyQt-builder - The PEP 517 Compliant PyQt Build System
Documentation
-------------
- The documentation for the latest release is part of the
- `PyQt5 <https://www.riverbankcomputing.com/static/Docs/PyQt5/>`__
- documentation.
+ The documentation for the latest release can be found
+ `here <https://www.riverbankcomputing.com/static/Docs/PyQt-builder/>`__.
Platform: X11
Platform: macOS
diff --git a/README b/README
index e7a16c5..1640943 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ What is PyQt-builder?
---------------------
PyQt-builder is the PEP 517 compliant build system for PyQt and projects that
-extend PyQt. It extends the sip build system and uses Qt's ``qmake`` to
+extend PyQt. It extends the SIP build system and uses Qt's ``qmake`` to
perform the actual compilation and installation of extension modules.
Projects that use PyQt-builder provide an appropriate ``pyproject.toml`` file
@@ -18,7 +18,7 @@ Author
------
PyQt-builder is copyright (c) Riverbank Computing Limited. Its homepage is
-https://www.riverbankcomputing.com/software/pyqt/.
+https://www.riverbankcomputing.com/software/pyqt-builder/.
Support may be obtained from the PyQt mailing list at
https://www.riverbankcomputing.com/mailman/listinfo/pyqt/.
@@ -27,7 +27,7 @@ https://www.riverbankcomputing.com/mailman/listinfo/pyqt/.
License
-------
-PyQt-builder is released under the BSD license.
+PyQt-builder is released under the same licenses as SIP.
Installation
@@ -44,6 +44,5 @@ installed automatically when it is needed.
Documentation
-------------
-The documentation for the latest release is part of the
-`PyQt5 <https://www.riverbankcomputing.com/static/Docs/PyQt5/>`__
-documentation.
+The documentation for the latest release can be found
+`here <https://www.riverbankcomputing.com/static/Docs/PyQt-builder/>`__.
diff --git a/doc/conf.py b/doc/conf.py
index bd10296..de10932 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -106,7 +106,7 @@ html_theme_path = ['.']
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
-html_title = "%s v%s Reference Guide" % (project, release)
+html_title = "%s v%s Documentation" % (project, release)
# Output file base name for HTML help builder.
htmlhelp_basename = 'PyQtBuilderdoc'
diff --git a/doc/index.rst b/doc/index.rst
index ae33b3d..26d70bc 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,5 +1,5 @@
-PyQt-builder Reference Guide
-============================
+Reference Guide
+===============
.. toctree::
:maxdepth: 2
diff --git a/pyqtbuild/bundle/packages/pyqt6.py b/pyqtbuild/bundle/packages/pyqt6.py
index c3762e9..b331d13 100644
--- a/pyqtbuild/bundle/packages/pyqt6.py
+++ b/pyqtbuild/bundle/packages/pyqt6.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Riverbank Computing Limited
+# Copyright (c) 2021, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -105,7 +105,7 @@ _QT_METADATA = {
'QtQuick':
VersionedMetadata(
lib_deps={'': ('QtQuickControls2', 'QtQuickControls2Impl',
- 'QtQuickParticles', 'QtQuickShapes',
+ 'QtQuickLayouts', 'QtQuickParticles', 'QtQuickShapes',
'QtQuickTemplates2', 'QtQuickTest')},
qml=True),
diff --git a/pyqtbuild/bundle/qt_wheel.py b/pyqtbuild/bundle/qt_wheel.py
index 6de8e9b..8cfbfcb 100644
--- a/pyqtbuild/bundle/qt_wheel.py
+++ b/pyqtbuild/bundle/qt_wheel.py
@@ -63,7 +63,7 @@ def qt_wheel(package, qt_dir, build_tag, suffix, msvc_runtime, openssl,
if qt_arch == 'gcc_64':
arch = 'manylinux{}_x86_64'.format(
'_2_28' if package.qt_version[0] == 6 else '2014')
- elif qt_arch == 'clang_64':
+ elif qt_arch in ('macos', 'clang_64'):
arch = 'macosx_{}_intel'.format(
'10_14' if package.qt_version[0] == 6 else '10_13')
elif qt_arch.startswith('msvc'):
diff --git a/pyqtbuild/version.py b/pyqtbuild/version.py
index 623aaa5..cc2e9d7 100644
--- a/pyqtbuild/version.py
+++ b/pyqtbuild/version.py
@@ -1,2 +1,2 @@
-PYQTBUILD_VERSION = 0x010a01
-PYQTBUILD_VERSION_STR = '1.10.1'
+PYQTBUILD_VERSION = 0x010a03
+PYQTBUILD_VERSION_STR = '1.10.3'
diff --git a/setup.cfg b/setup.cfg
index 63024bf..24813ba 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ description = The PEP 517 compliant PyQt build system
long_description = file: README
author = Riverbank Computing Limited
author_email = info at riverbankcomputing.com
-url = https://www.riverbankcomputing.com/software/pyqt/
+url = https://www.riverbankcomputing.com/software/pyqt-builder/
platforms = X11, macOS, Windows
[egg_info]
More information about the Neon-commits
mailing list