Hello community,
here is the log from the commit of package python-qtdatavis3d-qt5 for
openSUSE:Factory checked in at 2019-07-16 08:40:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qtdatavis3d-qt5 (Old)
and /work/SRC/openSUSE:Factory/.python-qtdatavis3d-qt5.new.1887 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qtdatavis3d-qt5"
Tue Jul 16 08:40:25 2019 rev:3 rq:714848 version:5.13.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-qtdatavis3d-qt5/python-qtdatavis3d-qt5.changes
2019-03-05 12:26:26.356831044 +0100
+++
/work/SRC/openSUSE:Factory/.python-qtdatavis3d-qt5.new.1887/python-qtdatavis3d-qt5.changes
2019-07-16 08:40:26.515018537 +0200
@@ -1,0 +2,6 @@
+Fri Jul 12 10:24:01 UTC 2019 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.13.0
+ * Bindings updated for QtDataVis 5.13.0.
+
+-------------------------------------------------------------------
Old:
----
PyQtDataVisualization_gpl-5.12.tar.gz
New:
----
PyQtDataVisualization_gpl-5.13.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qtdatavis3d-qt5.spec ++++++
--- /var/tmp/diff_new_pack.ejzBbv/_old 2019-07-16 08:40:27.119018739 +0200
+++ /var/tmp/diff_new_pack.ejzBbv/_new 2019-07-16 08:40:27.123018740 +0200
@@ -18,18 +18,18 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-qtdatavis3d-qt5
-Version: 5.12
+Version: 5.13.0
Release: 0
Summary: Python bindings for the Qt5 Data Visualization library
License: GPL-3.0-only
Group: Development/Libraries/Python
URL:
https://www.riverbankcomputing.com/software/pyqtdatavisualization/intro
-Source:
https://www.riverbankcomputing.com/static/Downloads/PyQtDataVisualization/PyQtDataVisualization_gpl-%{version}.tar.gz
-BuildRequires: pkgconfig(Qt5DataVisualization)
+Source:
https://www.riverbankcomputing.com/static/Downloads/PyQtDataVisualization/%{version}/PyQtDataVisualization_gpl-%{version}.tar.gz
BuildRequires: %{python_module devel}
BuildRequires: %{python_module qt5-devel}
BuildRequires: %{python_module sip-devel >= 4.19.1}
BuildRequires: python-rpm-macros
+BuildRequires: pkgconfig(Qt5DataVisualization)
Requires: python-qt5
Requires: python-sip(api) = %{python_sip_api_ver}
++++++ PyQtDataVisualization_gpl-5.12.tar.gz ->
PyQtDataVisualization_gpl-5.13.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtDataVisualization_gpl-5.12/ChangeLog
new/PyQtDataVisualization_gpl-5.13.0/ChangeLog
--- old/PyQtDataVisualization_gpl-5.12/ChangeLog 2019-02-04
16:20:37.000000000 +0100
+++ new/PyQtDataVisualization_gpl-5.13.0/ChangeLog 2019-07-04
18:47:50.000000000 +0200
@@ -1,5 +1,57 @@
+2019-07-03 Phil Thompson <[email protected]>
+
+ * NEWS:
+ Released as v5.13.0.
+ [ad358c94a194] [5.13.0]
+
+2019-07-02 Phil Thompson <[email protected]>
+
+ * NEWS:
+ Updated the NEWS file.
+ [9910e942a83a]
+
+2019-06-29 Phil Thompson <[email protected]>
+
+ * PyQtDataVisualization.msp:
+ Updated for Qt v5.13.0.
+ [b9081a443f01]
+
+2019-06-20 Phil Thompson <[email protected]>
+
+ * PyQtDataVisualization.msp:
+ Merged the 5.12-maint branch.
+ [015a6eafc97a]
+
+ * PyQtDataVisualization.msp:
+ Updated for Qt v5.12.4.
+ [0c40a20eaee9] <5.12-maint>
+
+ * rb-product:
+ Updated the minimum PyQt5 wheel.
+ [44e599689223]
+
+ * PyQtDataVisualization.msp:
+ Merged the 5.12-maint branch.
+ [f4bf32587234]
+
+2019-04-19 Phil Thompson <[email protected]>
+
+ * PyQtDataVisualization.msp:
+ Added support for Qt v5.12.3.
+ [9a505e28d4e9] <5.12-maint>
+
+2019-03-17 Phil Thompson <[email protected]>
+
+ * PyQtDataVisualization.msp:
+ Updated for Qt v5.12.2.
+ [65877b995045] <5.12-maint>
+
2019-02-04 Phil Thompson <[email protected]>
+ * .hgtags:
+ Added tag 5.12 for changeset 0780887f1728
+ [eaa09b4f36eb]
+
* NEWS:
Released as v5.12.
[0780887f1728] [5.12]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtDataVisualization_gpl-5.12/NEWS
new/PyQtDataVisualization_gpl-5.13.0/NEWS
--- old/PyQtDataVisualization_gpl-5.12/NEWS 2019-02-04 16:20:13.000000000
+0100
+++ new/PyQtDataVisualization_gpl-5.13.0/NEWS 2019-07-04 18:47:33.000000000
+0200
@@ -1,3 +1,6 @@
+v5.13.0 5th July 2019
+ - Added support for Qt v5.13.0.
+
v5.12 10th February 2019
- Added support for Qt v5.12.0 and Qt v5.12.1.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtDataVisualization_gpl-5.12/configure.py
new/PyQtDataVisualization_gpl-5.13.0/configure.py
--- old/PyQtDataVisualization_gpl-5.12/configure.py 2019-02-04
16:20:37.000000000 +0100
+++ new/PyQtDataVisualization_gpl-5.13.0/configure.py 2019-07-04
18:47:50.000000000 +0200
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Riverbank Computing Limited
+# Copyright (c) 2019, Riverbank Computing Limited
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-# This is v2.10 of this boilerplate.
+# This is v2.12 of this boilerplate.
from distutils import sysconfig
@@ -55,7 +55,7 @@
# The version of the module as a string. Set it to None if you don't
# provide version information.
- version = '5.12'
+ version = '5.13.0'
# The name of the PEP 376 .dist-info directory to be created.
distinfo_name = 'PyQtDataVisualization'
@@ -651,17 +651,19 @@
self.py_venv_inc_dir = py_config.venv_inc_dir
self.py_pylib_dir = py_config.lib_dir
self.py_sip_dir = os.path.join(py_config.data_dir, 'sip')
- self.sip_inc_dir = py_config.venv_inc_dir
# Remaining values.
+ self.abi_version = None
self.debug = False
self.pyqt_sip_flags = None
self.pyqt_version_str = ''
self.qmake = self._find_exe('qmake')
self.qmake_spec = ''
+ self.qmake_variables = []
self.qt_version = 0
self.qt_version_str = ''
self.sip = self._find_exe('sip5', 'sip')
+ self.sip_inc_dir = None
self.sip_version = None
self.sip_version_str = None
self.sysroot = ''
@@ -749,8 +751,6 @@
self.py_pylib_dir = parser.get(section, 'py_pylib_dir',
self.py_pylib_dir)
- self.sip_inc_dir = self.py_venv_inc_dir
-
self.module_dir = parser.get(section, 'module_dir', self.module_dir)
if self.pyqt_package is not None:
@@ -782,6 +782,14 @@
minor = (self.qt_version >> 8) & 0xff
patch = self.qt_version & 0xff
+ # Qt v5.12.4 was the last release where we updated PyQt for a
+ # patch version.
+ if (major, minor) >= (5, 13):
+ patch = 0
+ elif (major, minor) == (5, 12):
+ if patch > 4:
+ patch = 4
+
flags.append('-t')
flags.append('Qt_%d_%d_%d' % (major, minor, patch))
@@ -1023,6 +1031,12 @@
if opts.sip is not None:
self.sip = opts.sip
+ if opts.abi_version is not None:
+ if os.path.basename(self.sip) != 'sip5':
+ error("The --abi-version argument can only be used with sip5.")
+
+ self.abi_version = opts.abi_version
+
if pkg_config.distinfo_name and opts.distinfo:
self.distinfo = True
@@ -1144,6 +1158,9 @@
callback=optparser_store_abspath_dir, metavar="DIR",
help="the directory containing the sip.h header file file is DIR "
"[default: %s]" % target_config.sip_inc_dir)
+ p.add_option("--abi-version", dest='abi_version', default=None,
+ metavar="VERSION",
+ help="the SIP ABI version to use (sip5 only)")
if target_config.pyqt_package is not None:
p.add_option('--pyqt-sipdir', dest='pyqt_sip_dir', type='string',
@@ -1262,6 +1279,10 @@
# Build the SIP command line.
argv = [quote(target_config.sip)]
+ if target_config.abi_version:
+ argv.append('--abi-version')
+ argv.append(target_config.abi_version)
+
# Tell SIP if this is a debug build of Python (SIP v4.19.1 and later).
if target_config.sip_version >= 0x041301 and target_config.py_debug:
argv.append('-D')
@@ -1553,6 +1574,9 @@
pro.write(' \\\n %s' % s)
pro.write('\n')
+ if target_config.qmake_variables:
+ pro.write('\n'.join(target_config.qmake_variables) + '\n')
+
pro.close()
@@ -1659,9 +1683,10 @@
pass
-def _check_sip(target_config, pkg_config):
+def _check_sip(target_config, pkg_config, verbose):
""" Check that the version of sip is good enough. target_config is the
- target configuration. pkg_config is the package configuration.
+ target configuration. pkg_config is the package configuration. verbose is
+ set if the output is to be displayed.
"""
if target_config.sip is None:
@@ -1680,7 +1705,11 @@
pipe.close()
if '.dev' in version_str or 'snapshot' in version_str:
- version = 0
+ # We only need to distinguish between sip v4 and sip v5.
+ if os.path.basename(target_config.sip) == 'sip5':
+ version = 0x050000
+ else:
+ version = 0x040000
else:
version = version_from_string(version_str)
if version is None:
@@ -1696,6 +1725,36 @@
"This version of %s requires sip %s or later." %
(pkg_config.descriptive_name, min_sip_version))
+ if version >= 0x050000:
+ # Install the sip.h file for the private sip module.
+ if target_config.sip_inc_dir is None:
+ target_config.sip_inc_dir = os.path.join(
+ os.path.abspath(os.getcwd()), 'include')
+
+ inform("Installing sip.h in %s..." % target_config.sip_inc_dir)
+
+ os.makedirs(target_config.sip_inc_dir, exist_ok=True)
+
+ argv = ['sip5-header']
+
+ if target_config.abi_version:
+ argv.append('--abi-version')
+ argv.append(target_config.abi_version)
+
+ argv.append('--include-dir')
+ argv.append(quote(target_config.sip_inc_dir)),
+ argv.append('PyQt5.sip')
+
+ _run_command(' '.join(argv), verbose)
+
+ if not os.access(os.path.join(target_config.sip_inc_dir, 'sip.h'),
os.F_OK):
+ error(
+ "sip5-module failed to install sip.h int %s." %
+ target_config.sip_inc_dir)
+ else:
+ if target_config.sip_inc_dir is None:
+ target_config.sip_inc_dir = target_config.py_venv_inc_dir
+
target_config.sip_version = version
target_config.sip_version_str = version_str
@@ -1710,11 +1769,7 @@
# Parse the command line.
p = _create_optparser(target_config, pkg_config)
- opts, args = p.parse_args()
-
- if args:
- p.print_help()
- sys.exit(2)
+ opts, target_config.qmake_variables = p.parse_args()
target_config.apply_pre_options(opts)
@@ -1739,7 +1794,7 @@
target_config.introspect_pyqt(pkg_config)
# Check SIP is new enough.
- _check_sip(target_config, pkg_config)
+ _check_sip(target_config, pkg_config, opts.verbose)
# Perform any package specific checks now that all other information has
# been captured.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtDataVisualization_gpl-5.12/mk_distinfo.py
new/PyQtDataVisualization_gpl-5.13.0/mk_distinfo.py
--- old/PyQtDataVisualization_gpl-5.12/mk_distinfo.py 2019-02-04
13:02:04.000000000 +0100
+++ new/PyQtDataVisualization_gpl-5.13.0/mk_distinfo.py 2019-07-04
18:26:17.000000000 +0200
@@ -86,6 +86,10 @@
all_fns = []
for root, dirs, files in os.walk(native_name):
+ # Reproducable builds.
+ dirs.sort()
+ files.sort()
+
for f in files:
all_fns.append(os.path.join(root, f).replace(os.sep, '/'))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtDataVisualization_gpl-5.12/sip/QtDataVisualization/QtDataVisualizationmod.sip
new/PyQtDataVisualization_gpl-5.13.0/sip/QtDataVisualization/QtDataVisualizationmod.sip
---
old/PyQtDataVisualization_gpl-5.12/sip/QtDataVisualization/QtDataVisualizationmod.sip
2019-02-04 16:20:38.000000000 +0100
+++
new/PyQtDataVisualization_gpl-5.13.0/sip/QtDataVisualization/QtDataVisualizationmod.sip
2019-07-04 18:47:51.000000000 +0200
@@ -24,7 +24,7 @@
%Import QtGui/QtGuimod.sip
-%Timeline {QtDataVisualization_1_0_0 QtDataVisualization_1_1_0
QtDataVisualization_1_2_0 QtDataVisualization_1_2_1 QtDataVisualization_1_2_2
QtDataVisualization_5_7_0 QtDataVisualization_5_7_1 QtDataVisualization_5_8_0
QtDataVisualization_5_9_0 QtDataVisualization_5_9_1 QtDataVisualization_5_9_2
QtDataVisualization_5_9_3 QtDataVisualization_5_9_4 QtDataVisualization_5_9_5
QtDataVisualization_5_9_6 QtDataVisualization_5_9_7 QtDataVisualization_5_9_8
QtDataVisualization_5_9_9 QtDataVisualization_5_10_0 QtDataVisualization_5_10_1
QtDataVisualization_5_11_0 QtDataVisualization_5_11_1
QtDataVisualization_5_11_2 QtDataVisualization_5_11_3
QtDataVisualization_5_12_0 QtDataVisualization_5_12_1}
+%Timeline {QtDataVisualization_1_0_0 QtDataVisualization_1_1_0
QtDataVisualization_1_2_0 QtDataVisualization_1_2_1 QtDataVisualization_1_2_2
QtDataVisualization_5_7_0 QtDataVisualization_5_7_1 QtDataVisualization_5_8_0
QtDataVisualization_5_9_0 QtDataVisualization_5_9_1 QtDataVisualization_5_9_2
QtDataVisualization_5_9_3 QtDataVisualization_5_9_4 QtDataVisualization_5_9_5
QtDataVisualization_5_9_6 QtDataVisualization_5_9_7 QtDataVisualization_5_9_8
QtDataVisualization_5_9_9 QtDataVisualization_5_10_0 QtDataVisualization_5_10_1
QtDataVisualization_5_11_0 QtDataVisualization_5_11_1
QtDataVisualization_5_11_2 QtDataVisualization_5_11_3
QtDataVisualization_5_12_0 QtDataVisualization_5_12_1
QtDataVisualization_5_12_2 QtDataVisualization_5_12_3
QtDataVisualization_5_12_4 QtDataVisualization_5_13_0}
%Copying
Copyright (c) 2019 Riverbank Computing Limited <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtDataVisualization_gpl-5.12/sip/QtDataVisualization/qdatavisualizationglobal.sip
new/PyQtDataVisualization_gpl-5.13.0/sip/QtDataVisualization/qdatavisualizationglobal.sip
---
old/PyQtDataVisualization_gpl-5.12/sip/QtDataVisualization/qdatavisualizationglobal.sip
2019-02-04 16:20:38.000000000 +0100
+++
new/PyQtDataVisualization_gpl-5.13.0/sip/QtDataVisualization/qdatavisualizationglobal.sip
2019-07-04 18:47:51.000000000 +0200
@@ -25,6 +25,6 @@
const char *PYQT_DATAVISUALIZATION_VERSION_STR;
%ModuleCode
-static int PYQT_DATAVISUALIZATION_VERSION = 0x050c00;
-static const char *PYQT_DATAVISUALIZATION_VERSION_STR = "5.12";
+static int PYQT_DATAVISUALIZATION_VERSION = 0x050d00;
+static const char *PYQT_DATAVISUALIZATION_VERSION_STR = "5.13.0";
%End
