Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-arf for openSUSE:Factory checked in at 2022-04-04 19:26:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-arf (Old) and /work/SRC/openSUSE:Factory/.python-arf.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-arf" Mon Apr 4 19:26:33 2022 rev:6 rq:966738 version:2.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-arf/python-arf.changes 2021-07-08 22:49:24.444011406 +0200 +++ /work/SRC/openSUSE:Factory/.python-arf.new.1900/python-arf.changes 2022-04-04 19:26:55.696168655 +0200 @@ -1,0 +2,5 @@ +Sun Apr 3 12:44:55 UTC 2022 - Ben Greiner <[email protected]> + +- Add arf-pr10-h5py-open.patch -- gh#melizalab/arf#10 + +------------------------------------------------------------------- New: ---- arf-pr10-h5py-open.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-arf.spec ++++++ --- /var/tmp/diff_new_pack.wFURbi/_old 2022-04-04 19:26:58.732133846 +0200 +++ /var/tmp/diff_new_pack.wFURbi/_new 2022-04-04 19:26:58.736133800 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-arf # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,8 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 -%define skip_python36 1 Name: python-arf Version: 2.6.1 Release: 0 @@ -28,15 +27,21 @@ License: GPL-2.0-only URL: https://github.com/melizalab/arf Source: https://files.pythonhosted.org/packages/source/a/arf/arf-%{version}.tar.gz +# PATCH-FIX-UPSTREAM arf-pr10-h5py-open.patch -- gh#melizalab/arf#10 +Patch0: arf-pr10-h5py-open.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-h5py >= 2.10 -Requires: python-numpy >= 1.19 +Requires: python-h5py >= 2.8 +Conflicts: (python-h5py >= 3.3 with python-h5py < 3.4) BuildArch: noarch +# Leap 15.4 h5py-3.1 misses the cached-property requirement for python36 +%if 0%{suse_version} < 1550 +BuildRequires: %{python_module cached-property} +Requires: python-cached-property +%endif # SECTION test requirements -BuildRequires: %{python_module h5py >= 2.10} -BuildRequires: %{python_module numpy >= 1.19} +BuildRequires: %{python_module h5py >= 2.8 with (%python-h5py < 3.3 or %python-h5py >= 3.4)} BuildRequires: %{python_module pytest} # /SECTION %python_subpackages @@ -54,8 +59,7 @@ specifications on how different kinds of data are stored. %prep -%setup -q -n arf-%{version} -%autopatch -p1 +%autosetup -p1 -n arf-%{version} %build %python_build @@ -65,12 +69,13 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# gh#melizalab/arf#8 -%pytest -k 'not test01_creation_iter' +%pytest %files %{python_files} %doc README.md %license COPYING -%{python_sitelib}/* +%{python_sitelib}/arf.py* +%pycache_only %{python_sitelib}/__pycache__/arf*.pyc +%{python_sitelib}/arf-%{version}*-info %changelog ++++++ arf-pr10-h5py-open.patch ++++++ diff -ur arf-2.6.1.orig/arf.py arf-2.6.1/arf.py --- arf-2.6.1.orig/arf.py 2020-11-30 21:02:02.000000000 +0100 +++ arf-2.6.1/arf.py 2022-04-03 14:16:32.531010205 +0200 @@ -52,8 +52,9 @@ import os from h5py.version import version as h5py_version from distutils.version import StrictVersion - from h5py import h5p - from h5py._hl import files + from h5py import h5p, File + # Caution: This is a private API of h5py, subject to change without notice + from h5py._hl import files as _files try: # If the byte string doesn't match the default @@ -69,13 +70,18 @@ h5p.CRT_ORDER_TRACKED | h5p.CRT_ORDER_INDEXED) except AttributeError: # older version of h5py - fp = files.File(name, mode=mode, driver=driver, - libver=libver, **kwargs) + fp = File(name, mode=mode, driver=driver, libver=libver, **kwargs) else: + posargs=[] if StrictVersion(h5py_version) >= StrictVersion('2.9'): - kwargs.update(rdcc_nslots=None, rdcc_nbytes=None, rdcc_w0=None) - fapl = files.make_fapl(driver, libver, **kwargs) - fp = files.File(files.make_fid(name, mode, userblock_size, fapl, fcpl)) + posargs += ['rdcc_nslots', 'rdcc_nbytes', 'rdcc_w0'] + if StrictVersion(h5py_version) >= StrictVersion('3.5'): + posargs += ['locking', 'page_buf_size', 'min_meta_keep', 'min_raw_keep'] + kwargs.update({arg: kwargs.get(arg, None) for arg in posargs}) + fapl = _files.make_fapl(driver, libver, **kwargs) + fid = _files.make_fid(name, mode, userblock_size, fapl, fcpl=fcpl, + swmr=kwargs.get('swmr', False)) + fp = File(fid) if not exists and fp.mode == 'r+': set_attributes(fp,
