The package rpms/python-neatdend.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-neatdend.git/commit/?id=08....
Change:
+%ifnarch %{ix86}
Thanks.
Full change:
============
commit 7375ceec1e912d71fb3cf4396c392b776c6056c8
Author: Vanessa_kris <vanessaigwe1(a)gmail.com>
Date: Thu Jul 7 23:24:01 2022 +0100
initial import to src.fp.o
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b48fd71
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/python-neatdend-0.9.2.tar.gz
diff --git a/sources b/sources
new file mode 100644
index 0000000..158ea2c
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (python-neatdend-0.9.2.tar.gz) =
cffcc23e776896b827fadf95806efbc621f30727a79519c20063dc480f1f69737aa386cc18de9c74de1c27f1888e569eba1204e79d332edb0ab984af26957ac0
commit 0a7ef2b348f9a948fe82652c98dbbc5fa9c919ce
Author: Vanessa_kris <vanessaigwe1(a)gmail.com>
Date: Thu Jul 7 22:42:02 2022 +0100
Revert "build fails"
This reverts commit e3f9315793f54207fef5b74f139546224fee4c2d.
diff --git a/9cd568066b5ff8d6079e2d8cf8af388066cc9b79.patch
b/9cd568066b5ff8d6079e2d8cf8af388066cc9b79.patch
deleted file mode 100644
index 39d98a2..0000000
--- a/9cd568066b5ff8d6079e2d8cf8af388066cc9b79.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9cd568066b5ff8d6079e2d8cf8af388066cc9b79 Mon Sep 17 00:00:00 2001
-From: Scott W Harden <swharden(a)gmail.com>
-Date: Sat, 26 Mar 2022 17:06:51 -0400
-Subject: [PATCH] tests: improve approximation comparison
-
----
- tests/test_stimulus.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_stimulus.py b/tests/test_stimulus.py
-index 8799f01..49c515a 100644
---- a/tests/test_stimulus.py
-+++ b/tests/test_stimulus.py
-@@ -44,7 +44,7 @@ def test_findStimulusFile_foundIfPathGiven():
-
- assert isinstance(waveform, np.ndarray)
- assert not np.isnan(waveform).any()
-- assert pytest.approx(waveform[100000], 76.261)
-+ assert pytest.approx(waveform[100000]) == 76.261
-
-
- def cachedStimulusSpeedBoost(useCaching):
-@@ -61,7 +61,7 @@ def cachedStimulusSpeedBoost(useCaching):
- )
- stimulus = abf.stimulusByChannel[0]
- waveform = stimulus.stimulusWaveform(stimulusSweep=0)
-- assert pytest.approx(waveform[100000], 76.261)
-+ assert pytest.approx(waveform[100000]) == 76.261
- times[i] = time.perf_counter() - t1
-
- speedBoost = times[0]/times[1]
diff --git a/python-neatdend-0.9.2-2.fc37.src.rpm b/python-neatdend-0.9.2-2.fc37.src.rpm
deleted file mode 100644
index daac89e..0000000
Binary files a/python-neatdend-0.9.2-2.fc37.src.rpm and /dev/null differ
diff --git a/python-neatdend-0.9.2.tar.gz b/python-neatdend-0.9.2.tar.gz
deleted file mode 100644
index c79485c..0000000
Binary files a/python-neatdend-0.9.2.tar.gz and /dev/null differ
diff --git a/python-neatdend.spec b/python-neatdend.spec
index 94af480..b7d1b98 100644
--- a/python-neatdend.spec
+++ b/python-neatdend.spec
@@ -10,7 +10,6 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Support all arches for Neuron libs
# issue filed:
https://github.com/unibe-cns/NEAT/issues/142
Patch0: 0001-feat-support-all-arches.patch
-Patch1:
https://github.com/swharden/pyABF/commit/9cd568066b5ff8d6079e2d8cf8af3880...
BuildRequires: python3-devel
BuildRequires: python3-pytest
@@ -41,7 +40,6 @@ sed -i 's/^scikit_learn~=0.24.2/scikit_learn>=0.24.2/'
requirements/requirements
sed -i 's/^scipy~=1.6.3/scipy>=1.6.3/' requirements/requirements.txt
sed -i 's/^sympy~=1.7.1/sympy>=1.7.1/' requirements/requirements.txt
-
%generate_buildrequires
%pyproject_buildrequires -r
commit 09ecee4f64f95e114f2942a75153e387042a93cf
Author: Vanessa_kris <vanessaigwe1(a)gmail.com>
Date: Tue Jul 5 19:02:34 2022 +0100
build fails
diff --git a/9cd568066b5ff8d6079e2d8cf8af388066cc9b79.patch
b/9cd568066b5ff8d6079e2d8cf8af388066cc9b79.patch
new file mode 100644
index 0000000..39d98a2
--- /dev/null
+++ b/9cd568066b5ff8d6079e2d8cf8af388066cc9b79.patch
@@ -0,0 +1,31 @@
+From 9cd568066b5ff8d6079e2d8cf8af388066cc9b79 Mon Sep 17 00:00:00 2001
+From: Scott W Harden <swharden(a)gmail.com>
+Date: Sat, 26 Mar 2022 17:06:51 -0400
+Subject: [PATCH] tests: improve approximation comparison
+
+---
+ tests/test_stimulus.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_stimulus.py b/tests/test_stimulus.py
+index 8799f01..49c515a 100644
+--- a/tests/test_stimulus.py
++++ b/tests/test_stimulus.py
+@@ -44,7 +44,7 @@ def test_findStimulusFile_foundIfPathGiven():
+
+ assert isinstance(waveform, np.ndarray)
+ assert not np.isnan(waveform).any()
+- assert pytest.approx(waveform[100000], 76.261)
++ assert pytest.approx(waveform[100000]) == 76.261
+
+
+ def cachedStimulusSpeedBoost(useCaching):
+@@ -61,7 +61,7 @@ def cachedStimulusSpeedBoost(useCaching):
+ )
+ stimulus = abf.stimulusByChannel[0]
+ waveform = stimulus.stimulusWaveform(stimulusSweep=0)
+- assert pytest.approx(waveform[100000], 76.261)
++ assert pytest.approx(waveform[100000]) == 76.261
+ times[i] = time.perf_counter() - t1
+
+ speedBoost = times[0]/times[1]
diff --git a/python-neatdend-0.9.2-2.fc37.src.rpm b/python-neatdend-0.9.2-2.fc37.src.rpm
new file mode 100644
index 0000000..daac89e
Binary files /dev/null and b/python-neatdend-0.9.2-2.fc37.src.rpm differ
diff --git a/python-neatdend-0.9.2.tar.gz b/python-neatdend-0.9.2.tar.gz
new file mode 100644
index 0000000..c79485c
Binary files /dev/null and b/python-neatdend-0.9.2.tar.gz differ
diff --git a/python-neatdend.spec b/python-neatdend.spec
index b7d1b98..94af480 100644
--- a/python-neatdend.spec
+++ b/python-neatdend.spec
@@ -10,6 +10,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Support all arches for Neuron libs
# issue filed:
https://github.com/unibe-cns/NEAT/issues/142
Patch0: 0001-feat-support-all-arches.patch
+Patch1:
https://github.com/swharden/pyABF/commit/9cd568066b5ff8d6079e2d8cf8af3880...
BuildRequires: python3-devel
BuildRequires: python3-pytest
@@ -40,6 +41,7 @@ sed -i 's/^scikit_learn~=0.24.2/scikit_learn>=0.24.2/'
requirements/requirements
sed -i 's/^scipy~=1.6.3/scipy>=1.6.3/' requirements/requirements.txt
sed -i 's/^sympy~=1.7.1/sympy>=1.7.1/' requirements/requirements.txt
+
%generate_buildrequires
%pyproject_buildrequires -r
commit 08daab2356413a1a9a344356a357b46539813e76
Author: Vanessa_kris <vanessaigwe1(a)gmail.com>
Date: Mon May 23 11:56:52 2022 +0100
updated spec file
diff --git a/0001-feat-support-all-arches.patch b/0001-feat-support-all-arches.patch
new file mode 100644
index 0000000..fe3191b
--- /dev/null
+++ b/0001-feat-support-all-arches.patch
@@ -0,0 +1,33 @@
+From 2c0591d9255a958ec0a44041926685232dfcb7e2 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur(a)gmail.com>
+Date: Sun, 24 Apr 2022 16:37:45 +0100
+Subject: [PATCH 1/2] feat: support all arches
+
+---
+ neat/tools/simtools/neuron/neuronmodel.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/neat/tools/simtools/neuron/neuronmodel.py
b/neat/tools/simtools/neuron/neuronmodel.py
+index cc044ae..d4b126f 100644
+--- a/neat/tools/simtools/neuron/neuronmodel.py
++++ b/neat/tools/simtools/neuron/neuronmodel.py
+@@ -2,6 +2,7 @@ import os
+ import time
+ import copy
+ import warnings
++import platform
+
+ import numpy as np
+
+@@ -56,7 +57,7 @@ except ModuleNotFoundError:
+
+ h.load_file("stdlib.hoc") # contains the lambda rule
+ h.nrn_load_dll(os.path.join(os.path.dirname(__file__),
+- 'x86_64/.libs/libnrnmech.so')) # load all
mechanisms
++ platform.machine() + '/.libs/libnrnmech.so')) # load
all mechanisms
+
+
+ class MechName(object):
+--
+2.35.1
+
diff --git a/python-neatdend-0.9.2-1.fc37.src.rpm b/python-neatdend-0.9.2-1.fc37.src.rpm
new file mode 100644
index 0000000..1bf02cd
Binary files /dev/null and b/python-neatdend-0.9.2-1.fc37.src.rpm differ
diff --git a/python-neatdend.spec b/python-neatdend.spec
new file mode 100644
index 0000000..b7d1b98
--- /dev/null
+++ b/python-neatdend.spec
@@ -0,0 +1,77 @@
+Name: python-neatdend
+Version: 0.9.2
+Release: %autorelease
+Summary: NEAT (NEural Analysis Toolkit)
+
+License: GPLv3
+URL:
https://github.com/unibe-cns/NEAT
+Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+# Patches:
https://github.com/sanjayankur31/NEAT/tree/fedora-v0.9.2
+# Support all arches for Neuron libs
+# issue filed:
https://github.com/unibe-cns/NEAT/issues/142
+Patch0: 0001-feat-support-all-arches.patch
+
+BuildRequires: python3-devel
+BuildRequires: python3-pytest
+BuildRequires: gcc gcc-c++
+BuildRequires: git-core
+BuildRequires: python3-neuron
+BuildRequires: neuron-devel
+
+%global _description %{expand:
+NEAT is a python library for the study,
+simulation and simplification of morphological neuron models.}
+
+%description %_description
+
+%package -n python3-neatdend
+Summary: %{summary}
+
+%description -n python3-neatdend %_description
+
+
+%prep
+%autosetup -n NEAT-%{version} -S git
+
+sed -i 's/^numpy~=1.20.2/numpy>=1.20.2/' requirements/requirements.txt
+sed -i 's/^matplotlib~=3.4.1/matplotlib>=3.4.1/'
requirements/requirements.txt
+sed -i 's/^pytest~=5.3.2/pytest>=5.3.2/' requirements/requirements.txt
+sed -i 's/^scikit_learn~=0.24.2/scikit_learn>=0.24.2/'
requirements/requirements.txt
+sed -i 's/^scipy~=1.6.3/scipy>=1.6.3/' requirements/requirements.txt
+sed -i 's/^sympy~=1.7.1/sympy>=1.7.1/' requirements/requirements.txt
+
+%generate_buildrequires
+%pyproject_buildrequires -r
+
+
+%build
+%pyproject_wheel
+
+
+%install
+%pyproject_install
+%pyproject_save_files neat
+
+%check
+# a few tests fail on i686.
+# Upstream report:
https://github.com/unibe-cns/NEAT/issues/142#issuecomment-1107874903
+%ifnarch %{ix86}
+# we need to run these in a different directory to ensure that the module isn't
+# imported from the source directory
+mkdir testdir && pushd testdir
+# Python path must be defined so that compilechannels uses the installed module
+PYTHONPATH=$RPM_BUILD_ROOT/%{python3_sitelib}:$RPM_BUILD_ROOT/%{python3_sitearch}
$RPM_BUILD_ROOT/%{_bindir}/compilechannels default
+%pytest ../
+popd
+%endif
+
+# remove files generated for the tests
+rm -rf find $RPM_BUILD_ROOT/%{python3_sitearch}/neat/tools/simtools/neuron/mech/*.mod
+rm -rf find $RPM_BUILD_ROOT/%{python3_sitearch}/neat/tools/simtools/neuron/%{_arch}
+
+%files -n python3-neatdend -f %{pyproject_files}
+%doc README.rst CODE_OF_CONDUCT.rst CONTRIBUTING.rst CONTRIBUTORS.rst
+%{_bindir}/compilechannels
+
+%changelog
+%autochangelog