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=fb....
Change:
+%ifarch %{arm64}
Thanks.
Full change:
============
commit fbcc094b021755f0b3d18732645a1dc46cb80972
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Thu Apr 21 13:47:12 2022 +0100
feat: update to 0.11.0 (Fixes rhbz#2070262)
diff --git a/.gitignore b/.gitignore
index e9bc94a..46fa8ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/elephant-0.6.2.tar.gz
/elephant-0.6.4.tar.gz
/elephant-0.10.0.tar.gz
+/elephant-0.11.0.tar.gz
diff --git a/0001-Do-not-download-fim-so.patch b/0001-Do-not-download-fim-so.patch
deleted file mode 100644
index 8b4aa2f..0000000
--- a/0001-Do-not-download-fim-so.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 18c9e30f925240d64b02daec31c48cfa65368f77 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur(a)gmail.com>
-Date: Fri, 14 Jun 2019 16:26:22 +0100
-Subject: [PATCH] Do not download fim so
-
----
- setup.py | 27 ---------------------------
- 1 file changed, 27 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index e0a4b93..7b22001 100644
---- a/setup.py
-+++ b/setup.py
-@@ -17,33 +17,6 @@ for extra in ['extras', 'docs', 'tests']:
- with open('requirements-{0}.txt'.format(extra), 'r') as fp:
- extras_require[extra] = fp.read()
-
--# spade specific
--is_64bit = sys.maxsize > 2 ** 32
--is_python3 = float(sys.version[0:3]) > 2.7
--if platform.uname()[0] == "Windows":
-- oext = ".pyd"
--elif platform.uname()[0] == "Linux":
-- oext = ".so"
--else:
-- oext = None
--
--if oext:
-- if is_python3:
-- py_ver = '3'
-- else:
-- py_ver = '2'
-- if is_64bit:
-- arch = '64'
-- else:
-- arch = '32'
--
-- try:
--
urlretrieve('http://www.borgelt.net/bin' +
-- arch + '/py' + py_ver + '/fim' + oext,
-- 'elephant/spade_src/fim' + oext)
-- except:
-- print("Unable to download fim" + oext + " module.")
--
- setup(
- name="elephant",
- version='0.6.2',
---
-2.21.0
-
diff --git a/0001-use-fedora-build-flags.patch b/0001-use-fedora-build-flags.patch
new file mode 100644
index 0000000..b3fb225
--- /dev/null
+++ b/0001-use-fedora-build-flags.patch
@@ -0,0 +1,27 @@
+From 9e38be2effa193c32a5cf44601f51612c15137f1 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
+Subject: [PATCH] use fedora build flags
+
+---
+ setup.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f972085..96cce0b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -49,9 +49,7 @@ else:
+ libraries=['pthread', 'gomp'],
+ 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(
+ name="elephant",
+--
+2.35.1
+
diff --git a/python-elephant.spec b/python-elephant.spec
index f10b7f2..b6b9a48 100644
--- a/python-elephant.spec
+++ b/python-elephant.spec
@@ -1,84 +1,45 @@
-# Issue filed upstream asking them to not use nose
-#
https://github.com/NeuralEnsemble/elephant/issues/408
-
-# Disabled by default
-%bcond_with docs
-
# Try to download data, so a few are disabled.
# We test these in mock using --with=net_tests --enable-network
%bcond_with net_tests
%global pypi_name elephant
-Name: python-%{pypi_name}
-Version: 0.10.0
+Name: python-elephant
+Version: 0.11.0
Release: %autorelease
Summary: Elephant is a package for analysis of electrophysiology data in Python
License: BSD
URL:
http://neuralensemble.org/elephant
-Source0: %{pypi_source}
-BuildArch: noarch
+Source0: %{pypi_source elephant}
+# All changes are here
+#
https://github.com/sanjayankur31/elephant/tree/fedora-0.11.0
+Patch0: 0001-use-fedora-build-flags.patch
-# Remove bits from setup.py that try to download fim.
-# we use the packaged version
-# Patch0: 0001-Do-not-download-fim-so.patch
+# Includes a modified copy of fim, so we cannot use the system copy of pyfim.
+#
https://github.com/NeuralEnsemble/elephant/issues/471#issuecomment-109890...
BuildRequires: git-core
+BuildRequires: gcc-c++
BuildRequires: python3-devel
-BuildRequires: python3dist(neo)
-BuildRequires: python3dist(numpy)
-BuildRequires: python3dist(pandas)
-BuildRequires: python3dist(quantities)
-BuildRequires: python3dist(scikit-learn)
-BuildRequires: python3dist(scipy)
-BuildRequires: python3dist(statsmodels)
-BuildRequires: python3dist(setuptools)
-BuildRequires: python3dist(six)
-BuildRequires: python3dist(fim)
-BuildRequires: python3dist(pytest)
-BuildRequires: python3dist(tqdm)
-
-%if %{with docs}
-BuildRequires: python3dist(nbsphinx)
-BuildRequires: python3dist(numpydoc)
-BuildRequires: python3dist(sphinx)
-BuildRequires: python3-sphinx_rtd_theme
-BuildRequires: python3dist(sphinx-gallery)
-BuildRequires: python3dist(sphinxcontrib-bibtex)
-%endif
%description
Elephant - Electrophysiology Analysis Toolkit Elephant is a package for the
analysis of neurophysiology data, based on Neo.
-%{?python_enable_dependency_generator}
-
-%package -n python3-%{pypi_name}
+%package -n python3-elephant
Summary: %{summary}
-# For F32
-%py_provides python3-%{pypi_name}
-
-%description -n python3-%{pypi_name}
+%description -n python3-elephant
Elephant - Electrophysiology Analysis Toolkit Elephant is a package for the
analysis of neurophysiology data, based on Neo.
-%if %{with docs}
-%package -n python-%{pypi_name}-doc
-Summary: elephant documentation
-
-%description -n python-%{pypi_name}-doc
-Documentation for elephant
-
-%endif
-
%prep
-%autosetup -n %{pypi_name}-%{version} -S git
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+%autosetup -n elephant-%{version} -S git
-rm -frv doc/_build
+# Loosen scipy version cap
+#
https://github.com/NeuralEnsemble/elephant/issues/47
+sed -i 's/scipy.*/scipy/' requirements/requirements.txt
for lib in $(find . -type f -name "*.py"); do
sed '1{\@^#!/usr/bin/env python@d}' $lib > $lib.new &&
@@ -86,47 +47,42 @@ for lib in $(find . -type f -name "*.py"); do
mv $lib.new $lib
done
-# Use fim from python-pyfim which is faster
-sed -i 's|from elephant.spade_src import fim|import fim|' elephant/spade.py
+# collect all test requirements in one file
+echo >> requirements/requirements-tests.txt
+cat requirements/requirements-extras.txt >> requirements/requirements-tests.txt
+
+%generate_buildrequires
+%pyproject_buildrequires -r requirements/requirements-tests.txt
%build
-%py3_build
-
-%if %{with docs}
-pushd doc
- make SPHINXBUILD=sphinx-build-3 html
- rm -rf build/.doctrees
- rm -rf build/.buildinfo
-popd
-%endif
+%pyproject_wheel
%install
-%py3_install
+%pyproject_install
+%pyproject_save_files elephant
%check
# One test fails generally: reported upstream
-#
https://github.com/NeuralEnsemble/elephant/issues/409
-# Another fails on 32 bit builders: reported upstream
#
https://github.com/NeuralEnsemble/elephant/issues/410
-%if %{with net_tests}
-pytest-%{python3_version} -k "not test_repr and not test__UE_surrogate"
-%else
-# Disable tests that download bits
-pytest-%{python3_version} -k "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"
+#k="not test__UE_surrogate"
+
+# 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"
%endif
+%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"
+%endif
-%files -n python3-%{pypi_name}
-%license LICENSE.txt elephant/spade_src/LICENSE
-%doc README.md elephant/current_source_density_src/README.md
-%{python3_sitelib}/%{pypi_name}
-%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
+# serial
+# MPI tests hang in mock and builders, not sure why, so we skip them for the moment
+%pytest -v -k "${k} and not test_parallel"
-%if %{with docs}
-%files -n python-%{pypi_name}-doc
-%doc doc/_build/html
+%files -n python3-elephant -f %{pyproject_files}
%license LICENSE.txt elephant/spade_src/LICENSE
-%endif
%changelog
%autochangelog
diff --git a/sources b/sources
index f426633..a1e7172 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (elephant-0.10.0.tar.gz) =
cc10c0e9e44346a97b183408e92b4c5f55b0887e029c1bf4222473253297507e89f2af15210fb58e84adc90d7448bff97b28f814f2b6a072f06ae9049eaa6580
+SHA512 (elephant-0.11.0.tar.gz) =
47ed7d4b348c9050cebcc63fd90835600ffef429c8960df5090cba3384daa2dc83a72b147a25a3ce9264b0eb4488b22f6182dd86ae57fd4dbecdf7b3e6c32103
commit 024274ecf5e4573c5a88e6bed9a31cd1b74293f6
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Apr 11 17:18:34 2022 +0100
chore: use rpmautospec
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..2d55669
--- /dev/null
+++ b/changelog
@@ -0,0 +1,53 @@
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 0.10.0-3
+- Rebuilt for Python 3.10
+
+* Fri Mar 12 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.10.0-2
+- Add py_provides macro for F32
+
+* Thu Mar 11 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.10.0-1
+- Update to new release
+- Enable all non-network dependent tests
+- File bug for failing tests
+- Update fim tweak: no longer required in the test file
+- include statsmodels dependency
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.4-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.4-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 0.6.4-3
+- Rebuilt for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.4-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 23 2019 Luis Bazan <lbazan(a)fedoraproject.org> - 0.6.4-1
+- New upstream version
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 0.6.2-5
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.2-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Jun 14 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.6.2-3
+- Use pyfim which is 10 times faster than the python fast_fca according to docs
+- Patch out bits that try to download fim
+- Version neo requirements
+
+* Fri Jun 14 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.6.2-2
+- Report issues upstream and add links to spec file
+
+* Tue Jun 11 2019 Luis Bazan <lbazan(a)fedoraproject.org> - 0.6.2-2
+- Fix comment #11 BZ#1651824
+
+* Fri Jun 07 2019 Luis Bazan <lbazan(a)fedoraproject.org> - 0.6.2-1
+- Initial package.
diff --git a/python-elephant.spec b/python-elephant.spec
index b3c3b97..f10b7f2 100644
--- a/python-elephant.spec
+++ b/python-elephant.spec
@@ -12,7 +12,7 @@
Name: python-%{pypi_name}
Version: 0.10.0
-Release: 5%{?dist}
+Release: %autorelease
Summary: Elephant is a package for analysis of electrophysiology data in Python
License: BSD
URL:
http://neuralensemble.org/elephant
@@ -129,56 +129,4 @@ pytest-%{python3_version} -k "not test_repr and not
test__UE_surrogate and not t
%endif
%changelog
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-5
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 0.10.0-3
-- Rebuilt for Python 3.10
-
-* Fri Mar 12 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.10.0-2
-- Add py_provides macro for F32
-
-* Thu Mar 11 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.10.0-1
-- Update to new release
-- Enable all non-network dependent tests
-- File bug for failing tests
-- Update fim tweak: no longer required in the test file
-- include statsmodels dependency
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.4-5
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.4-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 0.6.4-3
-- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.4-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Dec 23 2019 Luis Bazan <lbazan(a)fedoraproject.org> - 0.6.4-1
-- New upstream version
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 0.6.2-5
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.2-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jun 14 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.6.2-3
-- Use pyfim which is 10 times faster than the python fast_fca according to docs
-- Patch out bits that try to download fim
-- Version neo requirements
-
-* Fri Jun 14 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.6.2-2
-- Report issues upstream and add links to spec file
-
-* Tue Jun 11 2019 Luis Bazan <lbazan(a)fedoraproject.org> - 0.6.2-2
-- Fix comment #11 BZ#1651824
-
-* Fri Jun 07 2019 Luis Bazan <lbazan(a)fedoraproject.org> - 0.6.2-1
-- Initial package.
+%autochangelog
commit 9482c830621bb449d049dfc6be5314334030de79
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 21 11:55:34 2022 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/python-elephant.spec b/python-elephant.spec
index 3785089..b3c3b97 100644
--- a/python-elephant.spec
+++ b/python-elephant.spec
@@ -12,7 +12,7 @@
Name: python-%{pypi_name}
Version: 0.10.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Elephant is a package for analysis of electrophysiology data in Python
License: BSD
URL:
http://neuralensemble.org/elephant
@@ -129,6 +129,9 @@ pytest-%{python3_version} -k "not test_repr and not
test__UE_surrogate and not t
%endif
%changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild