Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pyUSID for openSUSE:Factory
checked in at 2023-03-28 17:50:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pyUSID (Old)
and /work/SRC/openSUSE:Factory/.python-pyUSID.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyUSID"
Tue Mar 28 17:50:09 2023 rev:10 rq:1074790 version:0.0.10.post2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pyUSID/python-pyUSID.changes
2022-10-21 16:19:06.870124199 +0200
+++ /work/SRC/openSUSE:Factory/.python-pyUSID.new.31432/python-pyUSID.changes
2023-03-28 17:50:17.459242831 +0200
@@ -1,0 +2,10 @@
+Sun Mar 26 16:26:25 UTC 2023 - Ben Greiner <c...@bnavigator.de>
+
+- Update to 0.0.10.post2
+ * Minor release to fix failing functions with updated versions of
+ pillow, and a minor bug fix to reshaping circumstance where
+ there is only one position in a spectral dataset.
+- Add pyUSID-pr84-np1.24.patch gh#pycroscopy/pyUSID#84
+- Fix requirements
+
+-------------------------------------------------------------------
Old:
----
pyUSID-0.0.10.tar.gz
New:
----
pyUSID-0.0.10r2.tar.gz
pyUSID-pr84-np1.24.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pyUSID.spec ++++++
--- /var/tmp/diff_new_pack.6oPH5M/_old 2023-03-28 17:50:18.387247309 +0200
+++ /var/tmp/diff_new_pack.6oPH5M/_new 2023-03-28 17:50:18.391247329 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pyUSID
#
-# 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
@@ -17,18 +17,19 @@
%define packagename pyUSID
-%{?!python_module:%define python_module() python-%{**}}
-%define skip_python2 1
+%define ghtag 0.0.10r2
Name: python-pyUSID
-Version: 0.0.10
+Version: 0.0.10.post2
Release: 0
Summary: Framework for processing scientific data (USID)
License: MIT
URL: https://pycroscopy.github.io/pyUSID/
-Source0:
https://github.com/pycroscopy/pyUSID/archive/%{version}.tar.gz#/%{packagename}-%{version}.tar.gz
+Source0:
https://github.com/pycroscopy/pyUSID/archive/%{ghtag}.tar.gz#/%{packagename}-%{ghtag}.tar.gz
# PATCH-FIX-UPSTREAM abc_iterable.patch gh#pycroscopy/pyUSID#81 mc...@suse.com
# Iterable goes from collections.abc not directly from collections
Patch0: abc_iterable.patch
+# PATCH-FIX-UPSTREAM pyUSID-pr84-np1.24.patch gh#pycroscopy/pyUSID#84
+Patch1: pyUSID-pr84-np1.24.patch
BuildRequires: %{python_module Pillow}
BuildRequires: %{python_module cytoolz}
BuildRequires: %{python_module dask >= 0.10}
@@ -38,24 +39,22 @@
BuildRequires: %{python_module joblib >= 0.11.0}
BuildRequires: %{python_module matplotlib >= 2.0.0}
BuildRequires: %{python_module numpy >= 1.10}
+BuildRequires: %{python_module pip}
BuildRequires: %{python_module psutil}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module sidpy >= 0.0.1}
+BuildRequires: %{python_module sidpy >= 0.0.2}
BuildRequires: %{python_module toolz}
+BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-Pillow
Requires: python-cytoolz
Requires: python-dask >= 0.10
-Requires: python-dask-array
Requires: python-h5py >= 2.6.0
-Requires: python-ipywidgets >= 5.2.2
-Requires: python-joblib >= 0.11.0
-Requires: python-matplotlib >= 2.0.0
Requires: python-numpy >= 1.10
Requires: python-psutil
-Requires: python-sidpy >= 0.0.1
+Requires: python-sidpy >= 0.0.2
Requires: python-toolz
BuildArch: noarch
%python_subpackages
@@ -65,16 +64,14 @@
and Imaging Data (USID).
%prep
-%autosetup -p1 -n %{packagename}-%{version}
-
-# https://pycroscopy.github.io/pyUSID/
-sed -i 's:pytest-runner:pytest:' setup.py
+%autosetup -p1 -n %{packagename}-%{ghtag}
+sed -i -e /pytest-runner/d -e /six/d setup.py
%build
-%python_build
+%pyproject_wheel
%install
-%python_install
+%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
++++++ pyUSID-pr84-np1.24.patch ++++++
Index: pyUSID-0.0.10r2/pyUSID/io/usi_data.py
===================================================================
--- pyUSID-0.0.10r2.orig/pyUSID/io/usi_data.py
+++ pyUSID-0.0.10r2/pyUSID/io/usi_data.py
@@ -358,7 +358,7 @@ class USIDataset(h5py.Dataset):
'dimensions are {}.'.format(key,
self.n_dim_labels))
if not isinstance(val, (slice, list, np.ndarray, tuple, int,
- np.int, np.int64, np.int32, np.int16)):
+ np.int64, np.int32, np.int16)):
raise TypeError('The values for a slice must be a slice, list,'
' numpy array, a tuple, or an int. Provided '
'value: {} for dimension: {} was of type: {}'
Index: pyUSID-0.0.10r2/tests/io/test_dimension.py
===================================================================
--- pyUSID-0.0.10r2.orig/tests/io/test_dimension.py
+++ pyUSID-0.0.10r2/tests/io/test_dimension.py
@@ -42,7 +42,7 @@ class TestDimension(unittest.TestCase):
name = 'Bias'
quantity = 'generic'
units = 'V'
- values = np.arange(5, dtype=np.float)
+ values = np.arange(5, dtype=float)
descriptor = dimension.Dimension(name, units, len(values))
print(type(descriptor))
