Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-veusz for openSUSE:Factory checked in at 2023-01-14 20:32:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-veusz (Old) and /work/SRC/openSUSE:Factory/.python-veusz.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-veusz" Sat Jan 14 20:32:25 2023 rev:54 rq:1058332 version:3.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-veusz/python-veusz.changes 2022-12-06 16:25:14.062885616 +0100 +++ /work/SRC/openSUSE:Factory/.python-veusz.new.32243/python-veusz.changes 2023-01-14 20:32:26.637470202 +0100 @@ -1,0 +2,5 @@ +Fri Jan 13 16:55:18 UTC 2023 - Ben Greiner <c...@bnavigator.de> + +- Add veusz-numpy1.24.patch for compatibility with NumPy 1.24 + +------------------------------------------------------------------- New: ---- veusz-numpy1.24.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-veusz.spec ++++++ --- /var/tmp/diff_new_pack.JDCmkz/_old 2023-01-14 20:32:27.449474997 +0100 +++ /var/tmp/diff_new_pack.JDCmkz/_new 2023-01-14 20:32:27.453475020 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-veusz # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,8 +18,6 @@ %define X_display ":98" -%define skip_python2 1 -%define skip_python36 1 Name: python-veusz Version: 3.5.3 Release: 0 @@ -28,12 +26,16 @@ License: GPL-2.0-or-later AND Python-2.0 URL: https://veusz.github.io/ Source0: https://files.pythonhosted.org/packages/source/v/veusz/veusz-%{version}.tar.gz +# PATCH-FIX-UPSTREAM veusz-numpy1.24.patch commit without PR or issue +Patch1: https://github.com/veusz/veusz/commit/f93cf7ac0a1d93902524f38efbb58c4f0d016caa.patch#/veusz-numpy1.24.patch BuildRequires: %{python_module devel >= 3.8} BuildRequires: %{python_module numpy-devel} +BuildRequires: %{python_module pip} BuildRequires: %{python_module qt5-devel} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module sip-devel} BuildRequires: %{python_module tomli} +BuildRequires: %{python_module wheel} BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -72,6 +74,7 @@ Requires(postun):shared-mime-info Obsoletes: veusz3 < %{version} Provides: veusz3 = %{version} +BuildArch: noarch %description -n veusz Veusz is a scientific plotting package, designed to create @@ -101,11 +104,11 @@ %build export CFLAGS="%{optflags}" -%python_build +%pyproject_wheel %make_build -C Documents/ man %install -%python_install +%pyproject_install # Copy common files to /usr/share/ and... mkdir -p %{buildroot}%{_datadir}/veusz @@ -162,7 +165,7 @@ %doc README.md AUTHORS ChangeLog %doc Documents/manual/html %license COPYING -%{python_sitearch}/veusz-%{version}-py%{python_version}.egg-info +%{python_sitearch}/veusz-%{version}.dist-info %{python_sitearch}/veusz/ %files -n veusz ++++++ veusz-numpy1.24.patch ++++++ >From f93cf7ac0a1d93902524f38efbb58c4f0d016caa Mon Sep 17 00:00:00 2001 From: Jeremy Sanders <jer...@jeremysanders.net> Date: Thu, 22 Dec 2022 12:56:47 +0000 Subject: [PATCH] Replace removed type definitions in numpy --- veusz/datasets/filtered.py | 2 +- veusz/plugins/datasetplugin.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/veusz/datasets/filtered.py b/veusz/datasets/filtered.py index efa45009f..0eb996086 100644 --- a/veusz/datasets/filtered.py +++ b/veusz/datasets/filtered.py @@ -104,7 +104,7 @@ def evaluateFilter(self, doc): return [ _("Input filter expression non-numeric: '%s'") % self.inexpr] - filterarr = d.data.astype(N.bool) + filterarr = d.data.astype(N.bool_) if self.invert: filterarr = N.logical_not(filterarr) diff --git a/veusz/plugins/datasetplugin.py b/veusz/plugins/datasetplugin.py index 838f2e7b3..00628d197 100644 --- a/veusz/plugins/datasetplugin.py +++ b/veusz/plugins/datasetplugin.py @@ -780,8 +780,8 @@ def interleave(datasets): ds = [ N.hstack( (d, N.zeros(maxlength-len(d))) ) for d in datasets ] # which elements are valid - good = [ N.hstack( (N.ones(len(d), dtype=N.bool), - N.zeros(maxlength-len(d), dtype=N.bool)) ) + good = [ N.hstack( (N.ones(len(d), dtype=N.bool_), + N.zeros(maxlength-len(d), dtype=N.bool_)) ) for d in datasets ] intl = N.column_stack(ds).reshape(maxlength*len(datasets)) @@ -966,7 +966,7 @@ def updateDatasets(self, fields, helper): # mean data (only use finite values) tot = N.zeros(maxlength, dtype=N.float64) - num = N.zeros(maxlength, dtype=N.int) + num = N.zeros(maxlength, dtype=N.int_) for d in inds: f = N.isfinite(d.data) tot[:len(d.data)][f] += d.data[f] @@ -976,7 +976,7 @@ def updateDatasets(self, fields, helper): def averageError(errtype, fallback=None): """Get average for an error value.""" tot = N.zeros(maxlength, dtype=N.float64) - num = N.zeros(maxlength, dtype=N.int) + num = N.zeros(maxlength, dtype=N.int_) for d in inds: vals = getattr(d, errtype) if vals is None and fallback: @@ -1030,7 +1030,7 @@ def updateDatasets(self, fields, helper): # add data where finite data = N.zeros(maxlength, dtype=N.float64) - anyfinite = N.zeros(maxlength, dtype=N.bool) + anyfinite = N.zeros(maxlength, dtype=N.bool_) for d in inds: f = N.isfinite(d.data) data[:len(d.data)][f] += d.data[f] @@ -1213,7 +1213,7 @@ def updateDatasets(self, fields, helper): # output data and where data is finite data = N.ones(maxlength, dtype=N.float64) - anyfinite = N.zeros(maxlength, dtype=N.bool) + anyfinite = N.zeros(maxlength, dtype=N.bool_) for d in inds: f = N.isfinite(d.data) anyfinite[f] = True @@ -1386,7 +1386,7 @@ def updateDatasets(self, fields, helper): minvals = N.zeros(maxlength, dtype=N.float64) + 1e100 maxvals = N.zeros(maxlength, dtype=N.float64) - 1e100 - anyfinite = N.zeros(maxlength, dtype=N.bool) + anyfinite = N.zeros(maxlength, dtype=N.bool_) for d in inds: f = N.isfinite(d.data) anyfinite[f] = True @@ -1417,7 +1417,7 @@ def updateDatasets(self, fields, helper): if self.dserror is not None: # compute mean and look at differences from it tot = N.zeros(maxlength, dtype=N.float64) - num = N.zeros(maxlength, dtype=N.int) + num = N.zeros(maxlength, dtype=N.int_) for d in inds: f = N.isfinite(d.data) tot[f] += d.data[f] @@ -1594,10 +1594,10 @@ def updateDatasets(self, fields, helper): if filt is None: # select nothing - filt = N.zeros(data.shape, dtype=N.bool) + filt = N.zeros(data.shape, dtype=N.bool_) else: # filter must have int/bool type - filt = N.array(filt, dtype=N.bool) + filt = N.array(filt, dtype=N.bool_) try: if fields['replacenan']:
