The package rpms/python-elephant.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-elephant.git/commit/?id=db...
https://src.fedoraproject.org/cgit/rpms/python-elephant.git/commit/?id=ac....
Change:
+%ifarch %{power64}
+ExcludeArch: s390x
Thanks.
Full change:
============
commit db2d84ac50a48e100a64ba6d3762b72422e9432e
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Feb 27 15:37:40 2023 +0000
fix: deselect failing tests
diff --git a/python-elephant.spec b/python-elephant.spec
index 18c748a..140d379 100644
--- a/python-elephant.spec
+++ b/python-elephant.spec
@@ -75,7 +75,12 @@ cat requirements/requirements-extras.txt >>
requirements/requirements-tests.txt
# fails on aarch64
# reported upstream:
https://github.com/NeuralEnsemble/elephant/issues/479
%ifarch %{arm64}
-k="${k:-}${k:+ and }not test_welch_psd_multidim_input and not
test_welch_cohere_multidim_input"
+k="${k:-}${k:+ and }not test_welch_psd_multidim_input and not
test_welch_cohere_multidim_input and not test_multitaper_cohere_perfect_cohere"
+%endif
+
+# fails on ppc64le
+%ifarch %{power64}
+k="${k:-}${k:+ and} not test_multitaper_cohere_perfect_cohere"
%endif
%if %{without net_tests}
commit 4e49d1c4a08cc3f1b3757ac69e63c4eae71ab319
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Feb 27 14:27:35 2023 +0000
feat: update to 0.12.0 (fixes rhbz#2137931, fixes rhbz#2173307)
diff --git a/.gitignore b/.gitignore
index 6bb5da1..b02a427 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/elephant-0.10.0.tar.gz
/elephant-0.11.0.tar.gz
/elephant-0.11.1.tar.gz
+/elephant-0.12.0.tar.gz
diff --git a/0001-use-fedora-build-flags.patch b/0001-use-fedora-build-flags.patch
index 2ff702d..1f1117a 100644
--- a/0001-use-fedora-build-flags.patch
+++ b/0001-use-fedora-build-flags.patch
@@ -1,27 +1,28 @@
-From e9f4c645ae7fa05855d4a5429b7c1f2b4b65ff98 Mon Sep 17 00:00:00 2001
+From d7755ab180d819bc0e0879b5e25592fc053971e7 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur(a)gmail.com>
-Date: Wed, 20 Apr 2022 14:25:56 +0100
+Date: Mon, 27 Feb 2023 14:14:41 +0000
Subject: [PATCH] use fedora build flags
---
- setup.py | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
+ setup.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/setup.py b/setup.py
-index 7960705..ea5dd42 100644
+index a5abae0..2180c08 100644
--- a/setup.py
+++ b/setup.py
-@@ -49,9 +49,7 @@ elif platform.system() == "Linux":
- libraries=['pthread', 'gomp'],
+@@ -41,10 +41,7 @@ elif platform.system() == "Darwin":
+ libraries=['pthread', 'omp'],
extra_compile_args=[
'-DMODULE_NAME=fim', '-DUSE_OPENMP',
'-DWITH_SIG_TERM',
- '-Dfim_EXPORTS', '-O3', '-pedantic',
'-Wextra',
-- '-Weffc++', '-Wunused-result', '-Werror',
-- '-fopenmp', '-std=gnu++17'])
-+ '-Dfim_EXPORTS', '-Weffc++', '-fopenmp',
'-std=gnu++17'])
-
- setup_kwargs = {
- "name": "elephant",
+- '-Weffc++', '-Wunused-result', '-Werror',
'-Werror=return-type',
+- '-Xpreprocessor',
+- '-fopenmp', '-std=gnu++17'],
++ '-Dfim_EXPORTS', '-Weffc++', '-Xpreprocessor',
'-fopenmp', '-std=gnu++17'],
+ optional=True
+ )
+ elif platform.system() == "Linux":
--
-2.37.2
+2.39.2
diff --git a/python-elephant.spec b/python-elephant.spec
index d645677..18c748a 100644
--- a/python-elephant.spec
+++ b/python-elephant.spec
@@ -5,7 +5,7 @@
%global pypi_name elephant
Name: python-elephant
-Version: 0.11.1
+Version: 0.12.0
Release: %autorelease
Summary: Elephant is a package for analysis of electrophysiology data in Python
License: BSD
@@ -80,7 +80,7 @@ k="${k:-}${k:+ and }not test_welch_psd_multidim_input and not
test_welch_cohere_
%if %{without net_tests}
# Disable tests that download bits
-k="${k:-}${k:+ and }not test_repr and not test__UE_surrogate and not
test_spike_contrast_with_Izhikevich_network_auto and not test_Riehle_et_al_97_UE and not
test_multitaper_psd_against_nitime"
+k="${k:-}${k:+ and }not test_repr and not test__UE_surrogate and not
test_spike_contrast_with_Izhikevich_network_auto and not test_Riehle_et_al_97_UE and not
test_multitaper_psd_against_nitime and not test_WPLI_ and not
test_victor_purpura_matlab_comparison_"
%endif
# serial
diff --git a/sources b/sources
index 7fee34b..213653b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (elephant-0.11.1.tar.gz) =
783eb3394ba80c7c96da488d75e8c2abbd0f9c32d07506c6265183c35d2558cbc9588b310a533609d1152bccfadcb705804d660b66d315496672b9821158d4c3
+SHA512 (elephant-0.12.0.tar.gz) =
f076cff3029338b78ca731b0d8aca5f11a51a5eee8fff5b54d059b5ea3f9e595440b705a41bc0e00788ee5c357e0b2be1b4ac5731beb39524d824c54e447c1a3
commit 23a96785f75aac3e8056719260452264ec26a96e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 12:57:23 2023 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit acc7b978ca3659422ec0c95a98d40018d9320bb6
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Sun Oct 9 17:30:04 2022 +0100
feat: exclude s390x
pyedflib excludes it, so all deps need to exclude it too
diff --git a/python-elephant.spec b/python-elephant.spec
index 2f03797..d645677 100644
--- a/python-elephant.spec
+++ b/python-elephant.spec
@@ -15,6 +15,10 @@ Source0: %{pypi_source elephant}
#
https://github.com/sanjayankur31/elephant/tree/fedora-0.11.1
Patch0: 0001-use-fedora-build-flags.patch
+# python-pyedflib does not support s390x, so the complete dep tree needs to also exclude
it
+#
https://src.fedoraproject.org/rpms/python-pyedflib/blob/rawhide/f/python-...
+ExcludeArch: s390x
+
# Includes a modified copy of fim, so we cannot use the system copy of pyfim.
#
https://github.com/NeuralEnsemble/elephant/issues/471#issuecomment-109890...
commit 05ad2de12579596dfca701bd30fdc78a181122d9
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Fri Sep 9 23:17:26 2022 +0100
chore: add comment about upstream fix
diff --git a/python-elephant.spec b/python-elephant.spec
index 100bdce..2f03797 100644
--- a/python-elephant.spec
+++ b/python-elephant.spec
@@ -64,6 +64,8 @@ cat requirements/requirements-extras.txt >>
requirements/requirements-tests.txt
%check
# One test fails generally: reported upstream
#
https://github.com/NeuralEnsemble/elephant/issues/410
+# Fixed upstream (but Fedora dropped armv7hl support in F37)
+#
https://github.com/NeuralEnsemble/elephant/pull/500
#k="not test__UE_surrogate"
# fails on aarch64