[neon/forks/pyqt-builder/Neon/release] /: New upstream version 1.10.1+dfsg

[Dmitry Shachnev]

Git commit 881a96f4853cba4b2cb25de588b43c7baeede9bb by Dmitry Shachnev.
Committed on 15/06/2021 at 12:27.
Pushed by jriddell into branch 'Neon/release'.

New upstream version 1.10.1+dfsg

M  +19   -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/SOURCES.txt
M  +10   -2    pyqtbuild/builder.py
M  +2    -2    pyqtbuild/version.py

https://invent.kde.org/neon/forks/pyqt-builder/commit/881a96f4853cba4b2cb25de588b43c7baeede9bb

diff --git a/ChangeLog b/ChangeLog
index 45509c6..1b415ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2021-06-08  Phil Thompson  <phil at riverbankcomputing.com>
+
+	* .hgtags:
+	Added tag 1.10.1 for changeset 8686906e1af7
+	[cd2073872d3d] [tip] <1.10-maint>
+
+2021-05-13  Phil Thompson  <phil at riverbankcomputing.com>
+
+	* NEWS, pyqtbuild/builder.py:
+	The default sip module ABI version is now the minimum required by
+	current PyQt versions rather than the latest available from SIP.
+	[8686906e1af7] [1.10.1] <1.10-maint>
+
+2021-05-07  Phil Thompson  <phil at riverbankcomputing.com>
+
+	* .hgtags:
+	Added tag 1.10.0 for changeset b48ea1df701b
+	[c687f6d9c0e6]
+
 2021-04-10  Phil Thompson  <phil at riverbankcomputing.com>
 
 	* pyqtbuild/bundle/packages/__init__.py:
diff --git a/NEWS b/NEWS
index 002ed1a..0c11770 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+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.
+
 v1.10.0 10th April 2021
   - Added support for bundling Qt v6.1.
   - Added support for PyQt6-Charts to pyqt-bundle.
diff --git a/PKG-INFO b/PKG-INFO
index 2de75c6..bcf734b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: PyQt-builder
-Version: 1.10.0
+Version: 1.10.1
 Summary: The PEP 517 compliant PyQt build system
 Home-page: https://www.riverbankcomputing.com/software/pyqt/
 Author: Riverbank Computing Limited
diff --git a/PyQt_builder.egg-info/PKG-INFO b/PyQt_builder.egg-info/PKG-INFO
index 2de75c6..bcf734b 100644
--- a/PyQt_builder.egg-info/PKG-INFO
+++ b/PyQt_builder.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: PyQt-builder
-Version: 1.10.0
+Version: 1.10.1
 Summary: The PEP 517 compliant PyQt build system
 Home-page: https://www.riverbankcomputing.com/software/pyqt/
 Author: Riverbank Computing Limited
diff --git a/PyQt_builder.egg-info/SOURCES.txt b/PyQt_builder.egg-info/SOURCES.txt
index 0ea298c..bae1181 100644
--- a/PyQt_builder.egg-info/SOURCES.txt
+++ b/PyQt_builder.egg-info/SOURCES.txt
@@ -59,7 +59,7 @@ doc/html/_static/pygments.css
 doc/html/_static/riverbank.css
 doc/html/_static/searchtools.js
 doc/html/_static/sidebar.js
-doc/html/_static/underscore-1.3.1.js
+doc/html/_static/underscore-1.13.1.js
 doc/html/_static/underscore.js
 doc/riverbank/layout.html
 doc/riverbank/theme.conf
diff --git a/pyqtbuild/builder.py b/pyqtbuild/builder.py
index 6cd01b9..105a6e4 100644
--- a/pyqtbuild/builder.py
+++ b/pyqtbuild/builder.py
@@ -137,10 +137,18 @@ class QmakeBuilder(Builder):
 
             # 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.
                 if project.sip_module == 'PyQt5.sip':
-                    project.abi_version = '12'
+                    project.abi_version = '12.8'
                 elif project.sip_module == 'PyQt6.sip':
-                    project.abi_version = '13'
+                    project.abi_version = '13.1'
 
         super().apply_user_defaults(tool)
 
diff --git a/pyqtbuild/version.py b/pyqtbuild/version.py
index 7838a07..623aaa5 100644
--- a/pyqtbuild/version.py
+++ b/pyqtbuild/version.py
@@ -1,2 +1,2 @@
-PYQTBUILD_VERSION = 0x010a00
-PYQTBUILD_VERSION_STR = '1.10.0'
+PYQTBUILD_VERSION = 0x010a01
+PYQTBUILD_VERSION_STR = '1.10.1'