Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pypet for openSUSE:Factory
checked in at 2023-02-14 16:47:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pypet (Old)
and /work/SRC/openSUSE:Factory/.python-pypet.new.27156 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pypet"
Tue Feb 14 16:47:25 2023 rev:7 rq:1065670 version:0.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pypet/python-pypet.changes
2021-09-12 20:09:51.500105365 +0200
+++ /work/SRC/openSUSE:Factory/.python-pypet.new.27156/python-pypet.changes
2023-02-14 16:48:04.895384714 +0100
@@ -1,0 +2,6 @@
+Tue Feb 14 07:05:38 UTC 2023 - Steve Kowalik <steven.kowa...@suse.com>
+
+- Add patch support-numpy-1.20.patch:
+ * Support NumPy >= 1.20.
+
+-------------------------------------------------------------------
New:
----
support-numpy-1.20.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pypet.spec ++++++
--- /var/tmp/diff_new_pack.JoLZfy/_old 2023-02-14 16:48:05.371387524 +0100
+++ /var/tmp/diff_new_pack.JoLZfy/_new 2023-02-14 16:48:05.375387548 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-pypet
#
-# Copyright (c) 2021 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
@@ -16,18 +16,16 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define skip_python2 1
-%define skip_python36 1
%bcond_without test
Name: python-pypet
Version: 0.6.0
Release: 0
Summary: Parameter exploration and storage of results for numerical
simulations
License: BSD-3-Clause
-Group: Development/Languages/Python
URL: https://github.com/SmokinCaterpillar/pypet
Source:
https://files.pythonhosted.org/packages/source/p/pypet/pypet-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM gh#SmokinCaterpillar/pypet#65
+Patch0: support-numpy-1.20.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -60,7 +58,7 @@
from a single source.
%prep
-%setup -q -n pypet-%{version}
+%autosetup -p1 -n pypet-%{version}
%build
export LANG=en_US.UTF-8
++++++ support-numpy-1.20.patch ++++++
Index: pypet-0.6.0/pypet/pypetconstants.py
===================================================================
--- pypet-0.6.0.orig/pypet/pypetconstants.py
+++ pypet-0.6.0/pypet/pypetconstants.py
@@ -105,23 +105,22 @@ PARAMETER_SUPPORTED_DATA = (numpy.int8,
numpy.int16,
numpy.int32,
numpy.int64,
- numpy.int,
numpy.int_,
- numpy.long,
numpy.uint8,
numpy.uint16,
numpy.uint32,
numpy.uint64,
- numpy.bool,
numpy.bool_,
numpy.float32,
numpy.float64,
- numpy.float,
numpy.float_,
numpy.complex64,
- numpy.complex,
numpy.complex_,
numpy.str_,
+ bool,
+ int,
+ complex,
+ float,
str,
bytes)
"""Set of supported scalar types by the storage service and the standard
parameter"""
@@ -329,4 +328,4 @@ LOG_SET = '$set'
"""Wildcard replaced by the name of the current run set"""
DEFAULT_LOGGING = 'DEFAULT'
-"""Default logging configuration"""
\ No newline at end of file
+"""Default logging configuration"""
Index: pypet-0.6.0/pypet/parameter.py
===================================================================
--- pypet-0.6.0.orig/pypet/parameter.py
+++ pypet-0.6.0/pypet/parameter.py
@@ -894,8 +894,8 @@ class Parameter(BaseParameter):
# Numpy has many string types that depend on the length of the
string,
# We allow all of them
dtype = data.dtype
- if np.issubdtype(dtype, np.str):
- dtype = np.str
+ if np.issubdtype(dtype, str):
+ dtype = str
return dtype in pypetconstants.PARAMETER_SUPPORTED_DATA
Index: pypet-0.6.0/pypet/tests/testutils/data.py
===================================================================
--- pypet-0.6.0.orig/pypet/tests/testutils/data.py
+++ pypet-0.6.0/pypet/tests/testutils/data.py
@@ -118,7 +118,7 @@ def add_params(traj,param_dict):
traj.f_add_derived_parameter('Another.crun.String2', 'Really, again?',
comment='test4')
- traj.f_add_result('Peter_Jackson',np.str(['is','full','of','suboptimal
ideas']),
+ traj.f_add_result('Peter_Jackson', 'is full of suboptimal ideas',
comment='Only my opinion bro!',)
traj.results.f_add_leaf('Test', 42, comment='NC')
Index: pypet-0.6.0/pypet/tests/unittests/shared_data_test.py
===================================================================
--- pypet-0.6.0.orig/pypet/tests/unittests/shared_data_test.py
+++ pypet-0.6.0/pypet/tests/unittests/shared_data_test.py
@@ -267,7 +267,7 @@ class StorageDataTrajectoryTests(Traject
traj = Trajectory(name=make_trajectory_name(self), filename=filename)
trajname = traj.v_name
- npearray = np.ones((2, 10, 3), dtype=np.float)
+ npearray = np.ones((2, 10, 3), dtype=float)
thevlarray = np.array(['j'.encode('utf-8'), 22.2,
'gutter'.encode('utf-8')])
traj.f_store(only_init=True)
res = traj.f_add_result(SharedResult, 'arrays')
@@ -345,7 +345,7 @@ class StorageDataTrajectoryTests(Traject
filename = make_temp_dir('hdf5errors.hdf5')
traj = Trajectory(name=make_trajectory_name(self), filename=filename)
- npearray = np.ones((2, 10, 3), dtype=np.float)
+ npearray = np.ones((2, 10, 3), dtype=float)
thevlarray = np.array(['j'.encode('utf-8'), 22.2,
'gutter'.encode('utf-8')])
with self.assertRaises(TypeError):
@@ -979,4 +979,4 @@ class SharedArrayTest(TrajectoryComparat
if __name__ == '__main__':
opt_args = parse_args()
- run_suite(**opt_args)
\ No newline at end of file
+ run_suite(**opt_args)
Index: pypet-0.6.0/pypet/tests/integration/shared_data_test.py
===================================================================
--- pypet-0.6.0.orig/pypet/tests/integration/shared_data_test.py
+++ pypet-0.6.0/pypet/tests/integration/shared_data_test.py
@@ -172,7 +172,7 @@ class StorageDataEnvironmentTest(Traject
def add_array_params(self, traj):
length = len(traj)
- da_data = np.zeros(length, dtype=np.int)
+ da_data = np.zeros(length, dtype=int)
traj.f_store(only_init=True)
traj.f_add_result(SharedResult, 'daarrays.a',
SharedArray()).create_shared_data(obj=da_data)
traj.f_add_result(SharedResult, 'daarrays.ca',
SharedCArray()).create_shared_data( obj=da_data)
@@ -459,4 +459,4 @@ class MultiprocStorageNoPoolLockTest(Sto
if __name__ == '__main__':
opt_args = parse_args()
- run_suite(**opt_args)
\ No newline at end of file
+ run_suite(**opt_args)
