Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-lfdfiles for openSUSE:Factory
checked in at 2024-05-08 11:40:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-lfdfiles (Old)
and /work/SRC/openSUSE:Factory/.python-lfdfiles.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-lfdfiles"
Wed May 8 11:40:31 2024 rev:7 rq:1172592 version:2024.4.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-lfdfiles/python-lfdfiles.changes
2024-03-17 22:14:49.429794634 +0100
+++
/work/SRC/openSUSE:Factory/.python-lfdfiles.new.1880/python-lfdfiles.changes
2024-05-08 11:41:36.960880760 +0200
@@ -1,0 +2,6 @@
+Tue May 7 21:14:25 UTC 2024 - Dirk Müller <[email protected]>
+
+- update to 2024.4.24:
+ * Support NumPy 2.
+
+-------------------------------------------------------------------
Old:
----
lfdfiles-2024.3.4.tar.gz
New:
----
lfdfiles-2024.4.24.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-lfdfiles.spec ++++++
--- /var/tmp/diff_new_pack.fSc07y/_old 2024-05-08 11:41:37.480899671 +0200
+++ /var/tmp/diff_new_pack.fSc07y/_new 2024-05-08 11:41:37.480899671 +0200
@@ -18,7 +18,7 @@
%{?sle15_python_module_pythons}
Name: python-lfdfiles
-Version: 2024.3.4
+Version: 2024.4.24
Release: 0
Summary: Laboratory for Fluorescence Dynamics (LFD) file formats
License: BSD-3-Clause
++++++ lfdfiles-2024.3.4.tar.gz -> lfdfiles-2024.4.24.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lfdfiles-2024.3.4/.github/workflows/wheel.yml
new/lfdfiles-2024.4.24/.github/workflows/wheel.yml
--- old/lfdfiles-2024.3.4/.github/workflows/wheel.yml 2024-03-05
03:32:16.000000000 +0100
+++ new/lfdfiles-2024.4.24/.github/workflows/wheel.yml 2024-04-26
04:20:46.000000000 +0200
@@ -12,11 +12,11 @@
os: [ubuntu-22.04, macos-12, windows-2019]
steps:
- uses: actions/checkout@v4
- - uses: pypa/[email protected]
+ - uses: pypa/[email protected]
env:
CIBW_SKIP: "pp* cp37* cp38* *musllinux* *i686 *ppc64le *s390x
cp39*win*arm64 cp310*win*arm64"
CIBW_BEFORE_ALL_MACOS: curl -O
https://mac.r-project.org/openmp/openmp-14.0.6-darwin20-Release.tar.gz && sudo
tar fvxz openmp-14.0.6-darwin20-Release.tar.gz -C /
- CIBW_BEFORE_BUILD: python -m pip install numpy Cython
+ CIBW_BEFORE_BUILD: python -m pip install numpy>=2.0.0rc1 Cython
# CIBW_ARCHS_LINUX: auto aarch64
CIBW_ARCHS_LINUX: auto
CIBW_ARCHS_MACOS: x86_64 arm64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lfdfiles-2024.3.4/CHANGES.rst
new/lfdfiles-2024.4.24/CHANGES.rst
--- old/lfdfiles-2024.3.4/CHANGES.rst 2024-03-05 03:32:16.000000000 +0100
+++ new/lfdfiles-2024.4.24/CHANGES.rst 2024-04-26 04:20:46.000000000 +0200
@@ -1,6 +1,10 @@
Revisions
---------
+2024.4.24
+
+- Support NumPy 2.
+
2024.3.4
- Fix decoding 32-bit, 16 windows, 4 channels Spartan6 FBD files (#1).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lfdfiles-2024.3.4/README.rst
new/lfdfiles-2024.4.24/README.rst
--- old/lfdfiles-2024.3.4/README.rst 2024-03-05 03:32:16.000000000 +0100
+++ new/lfdfiles-2024.4.24/README.rst 2024-04-26 04:20:46.000000000 +0200
@@ -18,7 +18,7 @@
:Author: `Christoph Gohlke <https://www.cgohlke.com>`_
:License: BSD 3-Clause
-:Version: 2024.3.4
+:Version: 2024.4.24
:DOI: `10.5281/zenodo.8384166 <https://doi.org/10.5281/zenodo.8384166>`_
Quickstart
@@ -46,14 +46,14 @@
This revision was tested with the following requirements and dependencies
(other versions may work):
-- `CPython <https://www.python.org>`_ 3.9.13, 3.10.11, 3.11.8, 3.12.2
-- `Cython <https://pypi.org/project/cython/>`_ 3.0.8 (build)
+- `CPython <https://www.python.org>`_ 3.9.13, 3.10.11, 3.11.9, 3.12.3
+- `Cython <https://pypi.org/project/cython/>`_ 3.0.10 (build)
- `NumPy <https://pypi.org/project/numpy/>`_ 1.26.4
-- `Tifffile <https://pypi.org/project/tifffile/>`_ 2024.2.12 (optional)
+- `Tifffile <https://pypi.org/project/tifffile/>`_ 2024.4.24 (optional)
- `Czifile <https://pypi.org/project/czifile/>`_ 2019.7.2 (optional)
- `Oiffile <https://pypi.org/project/oiffile/>`_ 2023.8.30 (optional)
- `Netpbmfile <https://pypi.org/project/netpbmfile/>`_ 2023.8.30 (optional)
-- `Matplotlib <https://pypi.org/project/matplotlib/>`_ 3.8.3
+- `Matplotlib <https://pypi.org/project/matplotlib/>`_ 3.8.4
(optional, for plotting)
- `Click <https://pypi.python.org/pypi/click>`_ 8.1.7
(optional, for command line apps)
@@ -61,6 +61,10 @@
Revisions
---------
+2024.4.24
+
+- Support NumPy 2.
+
2024.3.4
- Fix decoding 32-bit, 16 windows, 4 channels Spartan6 FBD files (#1).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lfdfiles-2024.3.4/lfdfiles/_lfdfiles.pyx
new/lfdfiles-2024.4.24/lfdfiles/_lfdfiles.pyx
--- old/lfdfiles-2024.3.4/lfdfiles/_lfdfiles.pyx 2024-03-05
03:32:16.000000000 +0100
+++ new/lfdfiles-2024.4.24/lfdfiles/_lfdfiles.pyx 2024-04-26
04:20:46.000000000 +0200
@@ -86,7 +86,7 @@
data_t win_mask,
uint32_t win_shr,
bint swap_words = False,
- ):
+):
"""Decode FLIMbox data stream.
Parameters:
@@ -172,7 +172,7 @@
else:
bins_out[c, i] = -1 # no event
else:
- bins_out[c, i] = -2 # should never happen
+ bins_out[c, i] = -2 # should never happen
# record up-markers and absolute time
tcc_max = (tcc_mask >> tcc_shr) + 1
@@ -213,7 +213,7 @@
double units_per_sample,
double scanner_frame_start,
uint16_t[:, :, :, ::1] hist_out
- ):
+):
"""Calculate histograms from decoded FLIMbox data and frame markers.
Parameters:
@@ -240,7 +240,7 @@
ssize_t nframes = hist_out.shape[0]
ssize_t nchannels = hist_out.shape[1]
ssize_t framelen = hist_out.shape[2]
- ssize_t nwindows = hist_out.shape[3]
+ # ssize_t nwindows = hist_out.shape[3]
ssize_t i, j, k, f, c, idx
times_t t0
bins_t w
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lfdfiles-2024.3.4/lfdfiles/lfdfiles.py
new/lfdfiles-2024.4.24/lfdfiles/lfdfiles.py
--- old/lfdfiles-2024.3.4/lfdfiles/lfdfiles.py 2024-03-05 03:32:16.000000000
+0100
+++ new/lfdfiles-2024.4.24/lfdfiles/lfdfiles.py 2024-04-26 04:20:46.000000000
+0200
@@ -48,7 +48,7 @@
:Author: `Christoph Gohlke <https://www.cgohlke.com>`_
:License: BSD 3-Clause
-:Version: 2024.3.4
+:Version: 2024.4.24
:DOI: `10.5281/zenodo.8384166 <https://doi.org/10.5281/zenodo.8384166>`_
Quickstart
@@ -76,14 +76,14 @@
This revision was tested with the following requirements and dependencies
(other versions may work):
-- `CPython <https://www.python.org>`_ 3.9.13, 3.10.11, 3.11.8, 3.12.2
-- `Cython <https://pypi.org/project/cython/>`_ 3.0.8 (build)
+- `CPython <https://www.python.org>`_ 3.9.13, 3.10.11, 3.11.9, 3.12.3
+- `Cython <https://pypi.org/project/cython/>`_ 3.0.10 (build)
- `NumPy <https://pypi.org/project/numpy/>`_ 1.26.4
-- `Tifffile <https://pypi.org/project/tifffile/>`_ 2024.2.12 (optional)
+- `Tifffile <https://pypi.org/project/tifffile/>`_ 2024.4.24 (optional)
- `Czifile <https://pypi.org/project/czifile/>`_ 2019.7.2 (optional)
- `Oiffile <https://pypi.org/project/oiffile/>`_ 2023.8.30 (optional)
- `Netpbmfile <https://pypi.org/project/netpbmfile/>`_ 2023.8.30 (optional)
-- `Matplotlib <https://pypi.org/project/matplotlib/>`_ 3.8.3
+- `Matplotlib <https://pypi.org/project/matplotlib/>`_ 3.8.4
(optional, for plotting)
- `Click <https://pypi.python.org/pypi/click>`_ 8.1.7
(optional, for command line apps)
@@ -91,6 +91,10 @@
Revisions
---------
+2024.4.24
+
+- Support NumPy 2.
+
2024.3.4
- Fix decoding 32-bit, 16 windows, 4 channels Spartan6 FBD files (#1).
@@ -241,7 +245,7 @@
from __future__ import annotations
-__version__ = '2024.3.4'
+__version__ = '2024.4.24'
__all__ = [
'LfdFile',
@@ -332,8 +336,8 @@
)
if TYPE_CHECKING:
- from collections.abc import Iterator, Sequence
- from typing import Any, Callable, ClassVar, Literal, TypeVar
+ from collections.abc import Callable, Iterator, Sequence
+ from typing import Any, ClassVar, Literal, TypeVar
from numpy.typing import ArrayLike, DTypeLike, NDArray
@@ -837,9 +841,8 @@
if re.search(self._filepattern, self._filename, re.IGNORECASE) is None:
raise LfdFileError(
self,
- ".\n File name '{}' does not match '{}')".format(
- self._filename, self._filepattern
- ),
+ f'.\n File name {self._filename!r}'
+ f' does not match {self._filepattern!r}',
)
def _decompress_header(
@@ -2628,7 +2631,7 @@
>>> print(bins[0, :2], times[:2], markers)
[53 51] [ 0 42] [ 44097 124815]
>>> hist = [numpy.bincount(b[b>=0]) for b in bins]
- >>> numpy.argmax(hist[0])
+ >>> int(numpy.argmax(hist[0]))
53
"""
@@ -4199,9 +4202,9 @@
_record_t = numpy.dtype(
[
('_title_len', 'u1'),
- ('title', 'a80'),
+ ('title', 'S80'),
('number', 'i2'),
- ('frequency', [('_len', 'u1'), ('str', 'a6')], 25),
+ ('frequency', [('_len', 'u1'), ('str', 'S6')], 25),
('phase', 'i2', 25),
('modulation', 'i2', 25),
('deltap', 'i2', 25),
@@ -4487,7 +4490,7 @@
_header_t = numpy.dtype(
[
# undocumented file header
- ('signature', 'a10'), # 'VISTAIMAGE'
+ ('signature', 'S10'), # 'VISTAIMAGE'
('version', 'u2'),
('channel_bits', 'u2'),
('dimensions', 'u2', 3), # XYZ
@@ -4823,7 +4826,10 @@
for name, value in self.header.items()
if name != 'Comments'
),
- *(f'{name}Offset: {value}' for name, value in
self.offsets.items()),
+ *(
+ f'{name}Offset: {value}'
+ for name, value in self.offsets.items()
+ ),
(
f'Comments:\n{self.header["Comments"]}'
if 'Comments' in self.header
@@ -4846,11 +4852,11 @@
Examples:
>>> f = FlimfastFlif('flimfast.flif')
>>> data = f.asarray()
- >>> f.header.frequency
- 80.652
- >>> f.records['phase'][31]
+ >>> float(f.header.frequency)
+ 80.652...
+ >>> float(f.records['phase'][31])
348.75
- >>> data[31, 219, 299]
+ >>> int(data[31, 219, 299])
366
>>> f.totiff('_flimfast.flif.tif')
>>> f.close()
@@ -4870,10 +4876,10 @@
_header_t = numpy.dtype(
[
- ('magic', 'a8'), # '\211FLF\r\n0\n'
- ('creator', 'a120'),
- ('date', 'a32'),
- ('comments', 'a351'),
+ ('magic', 'S8'), # '\211FLF\r\n0\n'
+ ('creator', 'S120'),
+ ('date', 'S32'),
+ ('comments', 'S351'),
('_', 'u1'),
('fileprec', '<u2'),
('records', '<u2'),
