diff --git a/.gitignore b/.gitignore index 2dabd44..6b2f6fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /pyedflib-0.1.22.tar.gz /pyedflib-0.1.23.tar.gz +/pyedflib-0.1.25.tar.gz diff --git a/0001-Numpy-patch.patch b/0001-Numpy-patch.patch new file mode 100644 index 0000000..d53cc40 --- /dev/null +++ b/0001-Numpy-patch.patch @@ -0,0 +1,12 @@ +diff -urN a/pyproject.toml b/pyproject.toml +--- a/pyproject.toml 2022-01-21 21:05:01.000000000 +0100 ++++ b/pyproject.toml 2022-01-31 19:33:25.371933371 +0100 +@@ -2,7 +2,7 @@ + requires = [ + "setuptools", + "wheel", +- "oldest-supported-numpy", ++ "numpy", + "cython" + ] + build-backend = "setuptools.build_meta" diff --git a/0001-Use-default-numpy-version.patch b/0001-Use-default-numpy-version.patch deleted file mode 100644 index b01eacd..0000000 --- a/0001-Use-default-numpy-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN a/pyproject.toml b/pyproject.toml ---- a/pyproject.toml 2021-04-16 15:26:19.000000000 +0200 -+++ b/pyproject.toml 2021-11-08 21:38:57.758890447 +0100 -@@ -2,7 +2,7 @@ - requires = [ - "setuptools", - "wheel", -- "numpy <= 1.19.3", -+ "numpy", - "cython" - ] - build-backend = "setuptools.build_meta" diff --git a/python-pyedflib.spec b/python-pyedflib.spec index f2e12bf..e3c4290 100644 --- a/python-pyedflib.spec +++ b/python-pyedflib.spec @@ -11,16 +11,15 @@ In 2003, an improved version of the file protocol named EDF+ has been published and can be found at Kemp2003.} Name: python-pyedflib -Version: 0.1.23 -Release: 2%{?dist} +Version: 0.1.25 +Release: 1%{?dist} Summary: Python library to read/write EDF+/BDF+ files, based on EDFlib License: BSD URL: https://github.com/holgern/pyedflib Source0: %{url}/archive/v%{version}/pyedflib-%{version}.tar.gz -# Use default Fedora version of numpy in order to avoid complications -Patch0: 0001-Use-default-numpy-version.patch +Patch0: 0001-Numpy-patch.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2027046 ExcludeArch: s390x @@ -39,6 +38,8 @@ Summary: %{summary} BuildRequires: gcc-c++ BuildRequires: make BuildRequires: python3-devel +BuildRequires: %{py3_dist toml-adapt} +BuildRequires: %{py3_dist pytest} %description -n python3-pyedflib %_description @@ -79,7 +80,7 @@ find demo -type f -exec \ xargs -r -t sed -r -i '1{/^#!/d}' %generate_buildrequires -%pyproject_buildrequires -t +%pyproject_buildrequires %build %pyproject_wheel @@ -95,7 +96,7 @@ PYTHONPATH="${PWD}/build/lib.%{python3_platform}-%{python3_version}" \ %pyproject_save_files pyedflib %check -%tox +%pytest # Make sure we are still indicating the correct bundled edflib version: grep -E "^#define[[:blank:]]+EDFLIB_VERSION[[:blank:]]+\($( echo '%{edflib_version}' | tr -d '.' @@ -113,7 +114,8 @@ grep -E "^#define[[:blank:]]+EDFLIB_VERSION[[:blank:]]+\($( %doc demo %changelog +* Mon Jan 31 2022 Iztok Fister Jr. - 0.1.25-1 +- Update to the latest release + * Fri Jan 21 2022 Fedora Release Engineering - 0.1.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -%autochangelog diff --git a/sources b/sources index c28e8f8..c791a74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyedflib-0.1.23.tar.gz) = 9d53d4b620933a1a04cc388efc479e4d6fa18de9418cfd7444bf47cd44368a11f9c5872e2fd735b11966c01940409984bc356d010ad72a693024addc64e70826 +SHA512 (pyedflib-0.1.25.tar.gz) = beaf31048f2f40467d6d87f9056811ac0592a629c4a0d8a804747ffe89ad74c848c71360c4de0d41811ebf85dfa395237b4d28d003f94b32bc7866a37a97b865