Hello community, here is the log from the commit of package python-qtcharts-qt5 for openSUSE:Factory checked in at 2019-07-16 08:40:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-qtcharts-qt5 (Old) and /work/SRC/openSUSE:Factory/.python-qtcharts-qt5.new.1887 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qtcharts-qt5" Tue Jul 16 08:40:29 2019 rev:3 rq:714850 version:5.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-qtcharts-qt5/python-qtcharts-qt5.changes 2019-03-05 12:26:29.972831696 +0100 +++ /work/SRC/openSUSE:Factory/.python-qtcharts-qt5.new.1887/python-qtcharts-qt5.changes 2019-07-16 08:40:30.423019843 +0200 @@ -1,0 +2,6 @@ +Fri Jul 12 10:22:09 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.13.0 + Update bindings for QtCharts 5.13.0 + +------------------------------------------------------------------- Old: ---- PyQtChart_gpl-5.12.tar.gz New: ---- PyQtChart_gpl-5.13.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qtcharts-qt5.spec ++++++ --- /var/tmp/diff_new_pack.mkTWKi/_old 2019-07-16 08:40:31.003020037 +0200 +++ /var/tmp/diff_new_pack.mkTWKi/_new 2019-07-16 08:40:31.015020041 +0200 @@ -18,18 +18,18 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-qtcharts-qt5 -Version: 5.12 +Version: 5.13.0 Release: 0 Summary: Python bindings for the Qt5 Charts library License: GPL-3.0-only Group: Development/Libraries/Python URL: https://www.riverbankcomputing.com/software/pyqtchart/intro -Source: https://www.riverbankcomputing.com/static/Downloads/PyQtChart/PyQtChart_gpl-%{version}.tar.gz -BuildRequires: pkgconfig(Qt5Charts) +Source: https://www.riverbankcomputing.com/static/Downloads/PyQtChart/%{version}/PyQtChart_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(Qt5Charts) Requires: python-qt5 Requires: python-sip(api) = %{python_sip_api_ver} ++++++ PyQtChart_gpl-5.12.tar.gz -> PyQtChart_gpl-5.13.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQtChart_gpl-5.12/ChangeLog new/PyQtChart_gpl-5.13.0/ChangeLog --- old/PyQtChart_gpl-5.12/ChangeLog 2019-02-04 16:20:08.000000000 +0100 +++ new/PyQtChart_gpl-5.13.0/ChangeLog 2019-07-04 18:47:28.000000000 +0200 @@ -1,5 +1,52 @@ +2019-07-03 Phil Thompson <p...@riverbankcomputing.com> + + * NEWS: + Released as v5.13.0. + [1a2babc961e7] [5.13.0] + +2019-07-02 Phil Thompson <p...@riverbankcomputing.com> + + * NEWS: + Updated the NEWS file. + [65e47cb990b6] + +2019-06-29 Phil Thompson <p...@riverbankcomputing.com> + + * PyQtChart.msp: + Updated for Qt v5.13.0. + [33de5da50102] + +2019-06-20 Phil Thompson <p...@riverbankcomputing.com> + + * rb-product: + Updated the minimum PyQt5 wheel. + [51bdc25de3bd] + + * Merged the 5.12-maint branch. + [ebc71e698da9] + + * PyQtChart.msp: + Updated for Qt v5.12.4. + [1289bf656f8d] <5.12-maint> + +2019-04-19 Phil Thompson <p...@riverbankcomputing.com> + + * PyQtChart.msp: + Updated for Qt v5.12.3. + [dacfac407292] <5.12-maint> + +2019-03-17 Phil Thompson <p...@riverbankcomputing.com> + + * PyQtChart.msp: + Updated for Qt v5.12.2. + [db59d4e67410] <5.12-maint> + 2019-02-04 Phil Thompson <p...@riverbankcomputing.com> + * .hgtags: + Added tag 5.12 for changeset 419555012daa + [56d7c78e1eb7] + * NEWS: Released as v5.12. [419555012daa] [5.12] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQtChart_gpl-5.12/NEWS new/PyQtChart_gpl-5.13.0/NEWS --- old/PyQtChart_gpl-5.12/NEWS 2019-02-04 16:19:35.000000000 +0100 +++ new/PyQtChart_gpl-5.13.0/NEWS 2019-07-04 18:47:05.000000000 +0200 @@ -1,3 +1,6 @@ +v5.13.0 5th July 2019 + - Added support for Qt Charts v5.13.0. + v5.12 10th February 2019 - Added support for Qt Charts v5.12.0 and Qt v5.12.1. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQtChart_gpl-5.12/configure.py new/PyQtChart_gpl-5.13.0/configure.py --- old/PyQtChart_gpl-5.12/configure.py 2019-02-04 16:20:08.000000000 +0100 +++ new/PyQtChart_gpl-5.13.0/configure.py 2019-07-04 18:47:28.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 = 'PyQtChart' @@ -662,17 +662,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 = '' @@ -760,8 +762,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: @@ -793,6 +793,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)) @@ -1034,6 +1042,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 @@ -1155,6 +1169,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', @@ -1273,6 +1290,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') @@ -1564,6 +1585,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() @@ -1670,9 +1694,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: @@ -1691,7 +1716,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: @@ -1707,6 +1736,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 @@ -1721,11 +1780,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) @@ -1750,7 +1805,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/PyQtChart_gpl-5.12/mk_distinfo.py new/PyQtChart_gpl-5.13.0/mk_distinfo.py --- old/PyQtChart_gpl-5.12/mk_distinfo.py 2019-02-04 13:02:04.000000000 +0100 +++ new/PyQtChart_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/PyQtChart_gpl-5.12/sip/QtChart/QtChartmod.sip new/PyQtChart_gpl-5.13.0/sip/QtChart/QtChartmod.sip --- old/PyQtChart_gpl-5.12/sip/QtChart/QtChartmod.sip 2019-02-04 16:20:09.000000000 +0100 +++ new/PyQtChart_gpl-5.13.0/sip/QtChart/QtChartmod.sip 2019-07-04 18:47:29.000000000 +0200 @@ -25,7 +25,7 @@ %Import QtGui/QtGuimod.sip %Import QtWidgets/QtWidgetsmod.sip -%Timeline {QtChart_1_0_0 QtChart_1_1_0 QtChart_1_2_0 QtChart_1_2_1 QtChart_1_3_0 QtChart_1_3_1 QtChart_1_4_0 QtChart_2_0_0 QtChart_2_0_1 QtChart_2_1_0 QtChart_5_7_0 QtChart_5_7_1 QtChart_5_8_0 QtChart_5_9_0 QtChart_5_9_1 QtChart_5_9_2 QtChart_5_9_3 QtChart_5_9_4 QtChart_5_9_5 QtChart_5_9_6 QtChart_5_9_7 QtChart_5_9_8 QtChart_5_9_9 QtChart_5_10_0 QtChart_5_10_1 QtChart_5_11_0 QtChart_5_11_1 QtChart_5_11_2 QtChart_5_11_3 QtChart_5_12_0 QtChart_5_12_1} +%Timeline {QtChart_1_0_0 QtChart_1_1_0 QtChart_1_2_0 QtChart_1_2_1 QtChart_1_3_0 QtChart_1_3_1 QtChart_1_4_0 QtChart_2_0_0 QtChart_2_0_1 QtChart_2_1_0 QtChart_5_7_0 QtChart_5_7_1 QtChart_5_8_0 QtChart_5_9_0 QtChart_5_9_1 QtChart_5_9_2 QtChart_5_9_3 QtChart_5_9_4 QtChart_5_9_5 QtChart_5_9_6 QtChart_5_9_7 QtChart_5_9_8 QtChart_5_9_9 QtChart_5_10_0 QtChart_5_10_1 QtChart_5_11_0 QtChart_5_11_1 QtChart_5_11_2 QtChart_5_11_3 QtChart_5_12_0 QtChart_5_12_1 QtChart_5_12_2 QtChart_5_12_3 QtChart_5_12_4 QtChart_5_13_0} %Feature PYQTC_v1_0 %Feature PYQTC_v1_1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQtChart_gpl-5.12/sip/QtChart/qabstractaxis.sip new/PyQtChart_gpl-5.13.0/sip/QtChart/qabstractaxis.sip --- old/PyQtChart_gpl-5.12/sip/QtChart/qabstractaxis.sip 2019-02-04 16:20:09.000000000 +0100 +++ new/PyQtChart_gpl-5.13.0/sip/QtChart/qabstractaxis.sip 2019-07-04 18:47:29.000000000 +0200 @@ -282,5 +282,18 @@ %If (QtChart_2_1_0 -) void reverseChanged(bool reverse); %End + + public: +%If (QtChart_5_13_0 -) + void setLabelsEditable(bool editable = true); +%End +%If (QtChart_5_13_0 -) + bool labelsEditable() const; +%End + + signals: +%If (QtChart_5_13_0 -) + void labelsEditableChanged(bool editable); +%End }; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQtChart_gpl-5.12/sip/QtChart/qchartglobal.sip new/PyQtChart_gpl-5.13.0/sip/QtChart/qchartglobal.sip --- old/PyQtChart_gpl-5.12/sip/QtChart/qchartglobal.sip 2019-02-04 16:20:09.000000000 +0100 +++ new/PyQtChart_gpl-5.13.0/sip/QtChart/qchartglobal.sip 2019-07-04 18:47:29.000000000 +0200 @@ -25,6 +25,6 @@ const char *PYQT_CHART_VERSION_STR; %ModuleCode -static int PYQT_CHART_VERSION = 0x050c00; -static const char *PYQT_CHART_VERSION_STR = "5.12"; +static int PYQT_CHART_VERSION = 0x050d00; +static const char *PYQT_CHART_VERSION_STR = "5.13.0"; %End