The package rpms/python-pyedflib.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/python-pyedflib.git/commit/?id=2907b....
Change: +ExcludeArch: s390x
Thanks.
Full change: ============
commit 5aa2a48532d3af433fe2746e759bfd56859cd7d1 Author: iztokf iztok@iztok-jr-fister.eu Date: Sat Nov 27 13:29:21 2021 +0100
Add bugzilla ID for ExcludeArch
diff --git a/python-pyedflib.spec b/python-pyedflib.spec index ec8b248..0a8cbed 100644 --- a/python-pyedflib.spec +++ b/python-pyedflib.spec @@ -22,8 +22,7 @@ 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
-# Uses a forked copy of EDFlib (https://gitlab.com/Teuniz/EDFlib), which has -# elected not to support big-endian architectures. +# https://bugzilla.redhat.com/show_bug.cgi?id=2027046 ExcludeArch: s390x
# Uses a forked copy of EDFlib (https://gitlab.com/Teuniz/EDFlib)
commit ae00d0b824689a96466f0270ef6b95ea80664b5e Author: Benjamin A. Beasley code@musicinmybrain.net Date: Tue Nov 23 21:20:55 2021 -0500
Package demos/examples with documentation
diff --git a/python-pyedflib.spec b/python-pyedflib.spec index 4c22464..ec8b248 100644 --- a/python-pyedflib.spec +++ b/python-pyedflib.spec @@ -44,7 +44,7 @@ BuildRequires: python3-devel %description -n python3-pyedflib %_description
%package doc -Summary: Documentation for pyedflib +Summary: Documentation and examples for pyedflib BuildArch: noarch
%if %{with doc_pdf} @@ -56,6 +56,10 @@ BuildRequires: python3dist(matplotlib) BuildRequires: python3dist(numpydoc) %endif
+# Required by some demos/examples: +Suggests: python3dist(matplotlib) +Suggests: python3dist(scipy) + %description doc %{summary}.
@@ -69,6 +73,12 @@ latex_elements = { } EOF
+# Remove shebangs from demos. The find-then-modify pattern keeps us from +# discarding mtimes on sources that do not need modification. +find demo -type f -exec \ + gawk '/^#!/ { print FILENAME }; { nextfile }' '{}' '+' | + xargs -r -t sed -r -i '1{/^#!/d}' + %generate_buildrequires %pyproject_buildrequires -t
@@ -114,6 +124,7 @@ grep -E "^#define[[:blank:]]+EDFLIB_VERSION[[:blank:]]+($( %if %{with doc_pdf} %doc doc/build/latex/PyEDFlib.pdf %endif +%doc demo
%changelog %autochangelog
commit d07972227ec2b97eeb50606246d187302d3e3bb4 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Tue Nov 23 12:02:56 2021 -0500
Build and install Sphinx-generated PDF documentation
diff --git a/python-pyedflib.spec b/python-pyedflib.spec index 89fa595..4c22464 100644 --- a/python-pyedflib.spec +++ b/python-pyedflib.spec @@ -1,5 +1,8 @@ -# configuration problems in upstream's config -%bcond_with docs +# Sphinx-generated HTML documentation is not suitable for packaging; see +# https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. +# +# We can generate PDF documentation as substitute. +%bcond_without doc_pdf
%global _description %{expand: pyEDFlib is a python library to read/write EDF+/BDF+ files based on EDFlib. @@ -38,24 +41,33 @@ BuildRequires: gcc-c++ BuildRequires: make BuildRequires: python3-devel
-#For documentation -%if %{with docs} -BuildRequires: %{py3_dist sphinx} -BuildRequires: %{py3_dist sphinx-rtd-theme} -%endif - %description -n python3-pyedflib %_description
-%if %{with docs} %package doc -Summary: %{summary} +Summary: Documentation for pyedflib +BuildArch: noarch
-%description doc -Documentation for %{name}. +%if %{with doc_pdf} +BuildRequires: make +BuildRequires: python3-sphinx-latex +BuildRequires: latexmk +BuildRequires: python3dist(sphinx) +BuildRequires: python3dist(matplotlib) +BuildRequires: python3dist(numpydoc) %endif
+%description doc +%{summary}. + %prep %autosetup -p1 -n pyedflib-%{version} +# Avoid “too deeply nested” error generating LaTeX from Sphinx: +# https://github.com/sphinx-doc/sphinx/issues/777 +cat >> doc/source/conf.py <<'EOF' +latex_elements = { + 'preamble': r'\usepackage{enumitem}\setlistdepth{99}', +} +EOF
%generate_buildrequires %pyproject_buildrequires -t @@ -63,9 +75,23 @@ Documentation for %{name}. %build %pyproject_wheel
-%if %{with docs} -PYTHONPATH=".:.." make -C doc SPHINXOPTS=%{?_smp_mflags} SPHINXBUILD=sphinx-build-3 html -rm -rf doc/_build/html/{.doctrees,.buildinfo} -vf +%if %{with doc_pdf} +( + # Temporary local installation so we can import the Cython extension module + # to build documentation: + PYTEMP="${PWD}/%{_vpath_builddir}/pytemp" + export PYTHONPATH="${PYTEMP}" + + %{python3} -m pip install --target="${PYTEMP}" \ + --no-deps --use-pep517 --no-build-isolation \ + --disable-pip-version-check --no-clean --progress-bar off --verbose \ + %{_pyproject_wheeldir}/*.whl + + %make_build -C doc latex SPHINXOPTS='%{?_smp_mflags}' + %make_build -C doc/build/latex + + rm -rf "${PYTEMP}" +) %endif
%install @@ -83,10 +109,10 @@ grep -E "^#define[[:blank:]]+EDFLIB_VERSION[[:blank:]]+($( %license LICENSE %doc README.rst
-%if %{with docs} %files doc %license LICENSE -%doc doc/_build/html +%if %{with doc_pdf} +%doc doc/build/latex/PyEDFlib.pdf %endif
%changelog
commit 9846d7c5fbe933e818661c4a9c79478e76e4548d Author: Benjamin A. Beasley code@musicinmybrain.net Date: Tue Nov 23 12:40:00 2021 -0500
Drop pyproject-rpm-macros BR
This is now implied by python3-devel.
diff --git a/python-pyedflib.spec b/python-pyedflib.spec index f69c8bc..89fa595 100644 --- a/python-pyedflib.spec +++ b/python-pyedflib.spec @@ -37,7 +37,6 @@ Summary: %{summary} BuildRequires: gcc-c++ BuildRequires: make BuildRequires: python3-devel -BuildRequires: pyproject-rpm-macros
#For documentation %if %{with docs}
commit 94ebe02614e491727a350a1df542a692069ae5da Author: Benjamin A. Beasley code@musicinmybrain.net Date: Tue Nov 23 11:54:11 2021 -0500
Drop %%{pretty_name} macro
There is no constrasting macro %%{srcname} or %%{modname}, so it’s a little confusing to see a %%{pretty_name}. Plus, just using “pyedflib” arguably makes the spec file easier to follow.
diff --git a/python-pyedflib.spec b/python-pyedflib.spec index 80b7158..f69c8bc 100644 --- a/python-pyedflib.spec +++ b/python-pyedflib.spec @@ -1,22 +1,20 @@ # configuration problems in upstream's config %bcond_with docs
-%global pretty_name pyedflib - %global _description %{expand: pyEDFlib is a python library to read/write EDF+/BDF+ files based on EDFlib. EDF means European Data Format and was firstly published Kemp1992. In 2003, an improved version of the file protocol named EDF+ has been published and can be found at Kemp2003.}
-Name: python-%{pretty_name} +Name: python-pyedflib Version: 0.1.23 Release: 1%{?dist} Summary: Python library to read/write EDF+/BDF+ files, based on EDFlib
License: BSD -URL: https://github.com/holgern/%%7Bpretty_name%7D -Source0: %{url}/archive/v%{version}/%{pretty_name}-%{version}.tar.gz +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 @@ -33,7 +31,7 @@ Provides: bundled(edflib) = %{edflib_version}
%description %_description
-%package -n python3-%{pretty_name} +%package -n python3-pyedflib Summary: %{summary}
BuildRequires: gcc-c++ @@ -47,7 +45,7 @@ BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-rtd-theme} %endif
-%description -n python3-%{pretty_name} %_description +%description -n python3-pyedflib %_description
%if %{with docs} %package doc @@ -58,7 +56,7 @@ Documentation for %{name}. %endif
%prep -%autosetup -p1 -n %{pretty_name}-%{version} +%autosetup -p1 -n pyedflib-%{version}
%generate_buildrequires %pyproject_buildrequires -t @@ -82,7 +80,7 @@ grep -E "^#define[[:blank:]]+EDFLIB_VERSION[[:blank:]]+($( echo '%{edflib_version}' | tr -d '.' ))[[:blank:]]*$" 'pyedflib/_extensions/c/edflib.c'
-%files -n python3-%{pretty_name} -f %{pyproject_files} +%files -n python3-pyedflib -f %{pyproject_files} %license LICENSE %doc README.rst
commit 45f3c2c9aa1330061978762adf5ee2ce8a569136 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Tue Nov 23 10:38:56 2021 -0500
Add a sanity check for bundled edflib version
diff --git a/python-pyedflib.spec b/python-pyedflib.spec index a98605f..80b7158 100644 --- a/python-pyedflib.spec +++ b/python-pyedflib.spec @@ -28,7 +28,8 @@ ExcludeArch: s390x # Uses a forked copy of EDFlib (https://gitlab.com/Teuniz/EDFlib) # https://github.com/holgern/pyedflib/issues/149 # Version number: pyedflib/_extensions/c/edflib.c, EDFLIB_VERSION -Provides: bundled(edflib) = 1.17 +%global edflib_version 1.17 +Provides: bundled(edflib) = %{edflib_version}
%description %_description
@@ -76,6 +77,10 @@ rm -rf doc/_build/html/{.doctrees,.buildinfo} -vf
%check %tox +# Make sure we are still indicating the correct bundled edflib version: +grep -E "^#define[[:blank:]]+EDFLIB_VERSION[[:blank:]]+($( + echo '%{edflib_version}' | tr -d '.' +))[[:blank:]]*$" 'pyedflib/_extensions/c/edflib.c'
%files -n python3-%{pretty_name} -f %{pyproject_files} %license LICENSE
commit 242d20a2ab60e7c8a3c698ca96efea3540c3822d Author: Benjamin A. Beasley code@musicinmybrain.net Date: Tue Nov 23 10:33:24 2021 -0500
Update to 0.1.23
diff --git a/.gitignore b/.gitignore index 3016ec6..2dabd44 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pyedflib-0.1.22.tar.gz +/pyedflib-0.1.23.tar.gz diff --git a/python-pyedflib.spec b/python-pyedflib.spec index c9f1515..a98605f 100644 --- a/python-pyedflib.spec +++ b/python-pyedflib.spec @@ -10,7 +10,7 @@ In 2003, an improved version of the file protocol named EDF+ has been published and can be found at Kemp2003.}
Name: python-%{pretty_name} -Version: 0.1.22 +Version: 0.1.23 Release: 1%{?dist} Summary: Python library to read/write EDF+/BDF+ files, based on EDFlib
diff --git a/sources b/sources index b34e2e4..c28e8f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyedflib-0.1.22.tar.gz) = d5666780bdae351d7d1e7f11b25acff55a920181e1265930001be42d8dfb84a18422f6d8ce1eb33e4d002b1e5674311205f5a63eef79b6619801b196d446c134 +SHA512 (pyedflib-0.1.23.tar.gz) = 9d53d4b620933a1a04cc388efc479e4d6fa18de9418cfd7444bf47cd44368a11f9c5872e2fd735b11966c01940409984bc356d010ad72a693024addc64e70826
commit 2907bb4162df1097b2868286e1955569f012f0d2 Author: iztokf iztok@iztok-jr-fister.eu Date: Mon Nov 22 20:23:58 2021 +0100
Initial import (#2021429).
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3016ec6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/pyedflib-0.1.22.tar.gz diff --git a/0001-Use-default-numpy-version.patch b/0001-Use-default-numpy-version.patch new file mode 100644 index 0000000..b01eacd --- /dev/null +++ b/0001-Use-default-numpy-version.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 0000000..c9f1515 --- /dev/null +++ b/python-pyedflib.spec @@ -0,0 +1,91 @@ +# configuration problems in upstream's config +%bcond_with docs + +%global pretty_name pyedflib + +%global _description %{expand: +pyEDFlib is a python library to read/write EDF+/BDF+ files based on EDFlib. +EDF means European Data Format and was firstly published Kemp1992. +In 2003, an improved version of the file protocol named EDF+ has +been published and can be found at Kemp2003.} + +Name: python-%{pretty_name} +Version: 0.1.22 +Release: 1%{?dist} +Summary: Python library to read/write EDF+/BDF+ files, based on EDFlib + +License: BSD +URL: https://github.com/holgern/%%7Bpretty_name%7D +Source0: %{url}/archive/v%{version}/%{pretty_name}-%{version}.tar.gz + +# Use default Fedora version of numpy in order to avoid complications +Patch0: 0001-Use-default-numpy-version.patch + +# Uses a forked copy of EDFlib (https://gitlab.com/Teuniz/EDFlib), which has +# elected not to support big-endian architectures. +ExcludeArch: s390x + +# Uses a forked copy of EDFlib (https://gitlab.com/Teuniz/EDFlib) +# https://github.com/holgern/pyedflib/issues/149 +# Version number: pyedflib/_extensions/c/edflib.c, EDFLIB_VERSION +Provides: bundled(edflib) = 1.17 + +%description %_description + +%package -n python3-%{pretty_name} +Summary: %{summary} + +BuildRequires: gcc-c++ +BuildRequires: make +BuildRequires: python3-devel +BuildRequires: pyproject-rpm-macros + +#For documentation +%if %{with docs} +BuildRequires: %{py3_dist sphinx} +BuildRequires: %{py3_dist sphinx-rtd-theme} +%endif + +%description -n python3-%{pretty_name} %_description + +%if %{with docs} +%package doc +Summary: %{summary} + +%description doc +Documentation for %{name}. +%endif + +%prep +%autosetup -p1 -n %{pretty_name}-%{version} + +%generate_buildrequires +%pyproject_buildrequires -t + +%build +%pyproject_wheel + +%if %{with docs} +PYTHONPATH=".:.." make -C doc SPHINXOPTS=%{?_smp_mflags} SPHINXBUILD=sphinx-build-3 html +rm -rf doc/_build/html/{.doctrees,.buildinfo} -vf +%endif + +%install +%pyproject_install +%pyproject_save_files pyedflib + +%check +%tox + +%files -n python3-%{pretty_name} -f %{pyproject_files} +%license LICENSE +%doc README.rst + +%if %{with docs} +%files doc +%license LICENSE +%doc doc/_build/html +%endif + +%changelog +%autochangelog diff --git a/sources b/sources new file mode 100644 index 0000000..b34e2e4 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (pyedflib-0.1.22.tar.gz) = d5666780bdae351d7d1e7f11b25acff55a920181e1265930001be42d8dfb84a18422f6d8ce1eb33e4d002b1e5674311205f5a63eef79b6619801b196d446c134
arch-excludes@lists.fedoraproject.org