The package rpms/python-pynn.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-pynn.git/commit/?id=d5a1df...
https://src.fedoraproject.org/cgit/rpms/python-pynn.git/commit/?id=cd64a2....
Change:
+ExcludeArch: mips64r2 mips32r2 s390x %{ix86}
+ExcludeArch: mips64r2 mips32r2 s390x
Thanks.
Full change:
============
commit 521d65f4510f20fa1560bc23fff85850925b2189
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Fri Jan 13 13:49:00 2023 +0000
feat: update to 0.10.1 (fixes rhbz#2134727)
diff --git a/.gitignore b/.gitignore
index d5c8c3d..19bc2ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/PyNN-0.9.6.tar.gz
/PyNN-0.10.0.tar.gz
+/PyNN-0.10.1.tar.gz
diff --git a/0001-Disable-nest-extension-build-by-setup.patch
b/0001-Disable-nest-extension-build-by-setup.patch
index ec59a3b..056f643 100644
--- a/0001-Disable-nest-extension-build-by-setup.patch
+++ b/0001-Disable-nest-extension-build-by-setup.patch
@@ -1,17 +1,6 @@
-From 1f381ba3cf7c75f315459af5757293c2ffb1b1a2 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur(a)gmail.com>
-Date: Wed, 29 Dec 2021 09:53:14 +0000
-Subject: [PATCH 1/2] Disable nest extension build by setup
-
----
- setup.py | 73 --------------------------------------------------------
- 1 file changed, 73 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 3c12f649..be670f15 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2,81 +2,9 @@
+--- setup.py.orig 2023-01-13 10:21:41.331314707 +0000
++++ setup.py 2023-01-13 10:21:59.655009538 +0000
+@@ -2,83 +2,9 @@
try:
from setuptools import setup
@@ -38,6 +27,8 @@ index 3c12f649..be670f15 100644
- """At the end of the build process, try to compile NEURON and NEST
extensions."""
-
- def run(self):
+- self.distribution.convert_2to3_doctests = [] # workaround for bug
+- # see
https://app.travis-ci.com/github/NeuralEnsemble/PyNN/jobs/582235672
- _build.run(self)
- # try to compile NEURON extensions
- nrnivmodl = self.find("nrnivmodl")
@@ -93,14 +84,11 @@ index 3c12f649..be670f15 100644
setup(
-@@ -113,7 +41,6 @@ setup(
- 'Programming Language :: Python :: 3.8',
+@@ -116,7 +42,6 @@
'Programming Language :: Python :: 3.9',
+ 'Programming Language :: Python :: 3.10',
'Topic :: Scientific/Engineering'],
- cmdclass={'build_py': build},
- install_requires=['numpy>=1.16.1', 'lazyarray>=0.5.0',
'neo>=0.10.0',
+ install_requires=['numpy>=1.18.5', 'lazyarray>=0.5.2',
'neo>=0.11.0',
'quantities>=0.12.1'],
extras_require={
---
-2.33.1
-
diff --git a/0002-fix-correct-sized-import.patch b/0002-fix-correct-sized-import.patch
deleted file mode 100644
index 6162ee6..0000000
--- a/0002-fix-correct-sized-import.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a577b00c49691ed9549e9d20a95583ea2231b89e Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur(a)gmail.com>
-Date: Wed, 29 Dec 2021 19:15:55 +0000
-Subject: [PATCH 2/2] fix: correct sized import
-
----
- pyNN/parameters.py | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/pyNN/parameters.py b/pyNN/parameters.py
-index a7d06b11..627cd439 100644
---- a/pyNN/parameters.py
-+++ b/pyNN/parameters.py
-@@ -6,7 +6,10 @@ Parameter set handling
- """
-
- import numpy as np
--import collections
-+try:
-+ from collections import Sized
-+except ImportError:
-+ from collections.abc import Sized
- from pyNN.core import is_listlike
- from pyNN import errors
- from pyNN.random import RandomDistribution, NativeRNG
-@@ -296,11 +299,11 @@ class ParameterSpace(object):
- raise errors.NonExistentParameterError(name,
- model_name,
-
valid_parameter_names=self.schema.keys())
-- if issubclass(expected_dtype, ArrayParameter) and isinstance(value,
collections.Sized):
-+ if issubclass(expected_dtype, ArrayParameter) and isinstance(value,
Sized):
- if len(value) == 0:
- value = ArrayParameter([])
- elif not isinstance(value[0], ArrayParameter): # may be a more
generic way to do it, but for now this special-casing seems like the most robust approach
-- if isinstance(value[0], collections.Sized): # e.g. list of
tuples
-+ if isinstance(value[0], Sized): # e.g. list of tuples
- value = type(value)([ArrayParameter(x) for x in value])
- else:
- value = ArrayParameter(value)
---
-2.33.1
-
diff --git a/0003-Fix-errors-of-type-error-implicit-declaration-of-fun.patch
b/0003-Fix-errors-of-type-error-implicit-declaration-of-fun.patch
deleted file mode 100644
index c8b57ab..0000000
--- a/0003-Fix-errors-of-type-error-implicit-declaration-of-fun.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 297a96b5c6dd57cd6ab81b2b5ee4bb45b4570d91 Mon Sep 17 00:00:00 2001
-From: Andrew Davison <andrew.davison(a)cnrs.fr>
-Date: Tue, 12 Apr 2022 17:21:42 +0200
-Subject: [PATCH] Fix errors of type `error: implicit declaration of function
- 'nrn_random_arg' is invalid in C99` when running nrnivmodl on M1 Mac
-Content-type: text/plain
-
-Possibly related to #707
----
- pyNN/neuron/nmodl/quantal_stp.mod | 5 +++++
- pyNN/neuron/nmodl/stochastic_tsodyksmarkram.mod | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/pyNN/neuron/nmodl/quantal_stp.mod b/pyNN/neuron/nmodl/quantal_stp.mod
-index 8ff8bb4d..6d976501 100644
---- a/pyNN/neuron/nmodl/quantal_stp.mod
-+++ b/pyNN/neuron/nmodl/quantal_stp.mod
-@@ -81,6 +81,11 @@ NET_RECEIVE(w, available, t_last (ms)) {
- t_last = t
- }
-
-+VERBATIM
-+double nrn_random_pick(void* r);
-+void* nrn_random_arg(int argpos);
-+ENDVERBATIM
-+
- PROCEDURE setRNG() {
- : This function takes a NEURON Random object declared in hoc and makes it usable by
this mod file
- : The Random must be in uniform(1) mode
-diff --git a/pyNN/neuron/nmodl/stochastic_tsodyksmarkram.mod
b/pyNN/neuron/nmodl/stochastic_tsodyksmarkram.mod
-index 32dec506..519e578c 100644
---- a/pyNN/neuron/nmodl/stochastic_tsodyksmarkram.mod
-+++ b/pyNN/neuron/nmodl/stochastic_tsodyksmarkram.mod
-@@ -84,6 +84,11 @@ NET_RECEIVE(w, p_surv, t_surv) {
- }
- }
-
-+VERBATIM
-+double nrn_random_pick(void* r);
-+void* nrn_random_arg(int argpos);
-+ENDVERBATIM
-+
- PROCEDURE setRNG() {
- : This function takes a NEURON Random object declared in hoc and makes it usable by
this mod file
- : The Random must be in uniform(1) mode
---
-2.38.1
-
diff --git a/python-pynn.spec b/python-pynn.spec
index 2b9c00b..9a00607 100644
--- a/python-pynn.spec
+++ b/python-pynn.spec
@@ -43,11 +43,12 @@ Mailing list:
https://groups.google.com/forum/?fromgroups#!forum/neuralensemble
This package supports the NEURON, NEST, and Brian simulators.}
Name: python-pynn
-Version: 0.10.0
+Version: 0.10.1
Release: %autorelease
Summary: A package for simulator-independent specification of neuronal network
models
-License: CeCILL
+# SPDX
+License: CECILL-2.0
URL:
http://neuralensemble.org/PyNN/
Source0: %pypi_source PyNN
@@ -66,10 +67,6 @@ ExcludeArch: mips64r2 mips32r2 s390x %{ix86}
# Disable pynn's way of building extensions
# We do it ourselves
Patch0: 0001-Disable-nest-extension-build-by-setup.patch
-# Merged upstream:
https://github.com/NeuralEnsemble/PyNN/pull/744
-Patch1: 0002-fix-correct-sized-import.patch
-
-Patch2: 0003-Fix-errors-of-type-error-implicit-declaration-of-fun.patch
# For extensions
BuildRequires: boost-devel
@@ -145,7 +142,7 @@ BuildArch: noarch
Documentation for %{name}.
%prep
-%autosetup -n PyNN-%{version} -S git
+%autosetup -n PyNN-%{version}
rm -rfv PyNN-%{version}/pyNN.egg-info
%build
@@ -205,9 +202,9 @@ export
PYTHONPATH=$PYTHONPATH:$RPM_BUILD_ROOT/%{python3_sitearch}:$RPM_BUILD_ROO
pushd test
nosetests-%{python3_version} -e backends --verbosity=3 --tests=unittests
popd
-%{_mpich_unload}
%endif
unset PYTHONPATH
+%{_mpich_unload}
%endif
%if %{with openmpi}
@@ -219,9 +216,9 @@ export
PYTHONPATH=$PYTHONPATH:$RPM_BUILD_ROOT/%{python3_sitearch}:$RPM_BUILD_ROO
pushd test
nosetests-%{python3_version} -e backends --verbosity=3 --tests=unittests
popd
-%{_openmpi_unload}
%endif
unset PYTHONPATH
+%{_openmpi_unload}
%endif
# These files are NEURON files that are required by PyNN to run bits using the NEURON
backend
diff --git a/sources b/sources
index 8d8253a..9236445 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PyNN-0.10.0.tar.gz) =
c59097fb032efc0d2d612774cc7d9bea55ff616705f12dad99171a70f1670aa3d471ba2d332ac1191163520f0657d22665eba071e5992fe4821b63f73bf28e8c
+SHA512 (PyNN-0.10.1.tar.gz) =
292d824922c7dbf9e49810f382e54ab7fc342e559af287efaf630c676df67910815ad71684d8ca14e4ad38a28e5dcf5807764346976761d945919cdc33a1ae78
commit d5a1df03c6c177c0cae374e5b5b88c5ac18e7b23
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Thu Dec 22 13:23:06 2022 -0500
Leaf package: drop support for i686 (fix RHBZ#2155635)
diff --git a/python-pynn.spec b/python-pynn.spec
index dbf0781..2b9c00b 100644
--- a/python-pynn.spec
+++ b/python-pynn.spec
@@ -54,9 +54,14 @@ Source0: %pypi_source PyNN
# Random123 does not build on these, so neither can NEURON, so nothing that
# depends on NEURON supports them either
#
https://github.com/neuronsimulator/nrn/issues/114
+#
# 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: mips64r2 mips32r2 s390x
+#
+# python-pynn: Build hangs on i686
+#
https://bugzilla.redhat.com/show_bug.cgi?id=2155635
+#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: mips64r2 mips32r2 s390x %{ix86}
# Disable pynn's way of building extensions
# We do it ourselves
commit 50f7e02064d297ed0770bd46c847ee4ebc2b79c0
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Wed Dec 21 11:59:59 2022 +0100
Apply upstream patch to fix C99 compatibility issue
Related to:
<
https://fedoraproject.org/wiki/Changes/PortingToModernC>
<
https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
diff --git a/0003-Fix-errors-of-type-error-implicit-declaration-of-fun.patch
b/0003-Fix-errors-of-type-error-implicit-declaration-of-fun.patch
new file mode 100644
index 0000000..c8b57ab
--- /dev/null
+++ b/0003-Fix-errors-of-type-error-implicit-declaration-of-fun.patch
@@ -0,0 +1,48 @@
+From 297a96b5c6dd57cd6ab81b2b5ee4bb45b4570d91 Mon Sep 17 00:00:00 2001
+From: Andrew Davison <andrew.davison(a)cnrs.fr>
+Date: Tue, 12 Apr 2022 17:21:42 +0200
+Subject: [PATCH] Fix errors of type `error: implicit declaration of function
+ 'nrn_random_arg' is invalid in C99` when running nrnivmodl on M1 Mac
+Content-type: text/plain
+
+Possibly related to #707
+---
+ pyNN/neuron/nmodl/quantal_stp.mod | 5 +++++
+ pyNN/neuron/nmodl/stochastic_tsodyksmarkram.mod | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/pyNN/neuron/nmodl/quantal_stp.mod b/pyNN/neuron/nmodl/quantal_stp.mod
+index 8ff8bb4d..6d976501 100644
+--- a/pyNN/neuron/nmodl/quantal_stp.mod
++++ b/pyNN/neuron/nmodl/quantal_stp.mod
+@@ -81,6 +81,11 @@ NET_RECEIVE(w, available, t_last (ms)) {
+ t_last = t
+ }
+
++VERBATIM
++double nrn_random_pick(void* r);
++void* nrn_random_arg(int argpos);
++ENDVERBATIM
++
+ PROCEDURE setRNG() {
+ : This function takes a NEURON Random object declared in hoc and makes it usable by
this mod file
+ : The Random must be in uniform(1) mode
+diff --git a/pyNN/neuron/nmodl/stochastic_tsodyksmarkram.mod
b/pyNN/neuron/nmodl/stochastic_tsodyksmarkram.mod
+index 32dec506..519e578c 100644
+--- a/pyNN/neuron/nmodl/stochastic_tsodyksmarkram.mod
++++ b/pyNN/neuron/nmodl/stochastic_tsodyksmarkram.mod
+@@ -84,6 +84,11 @@ NET_RECEIVE(w, p_surv, t_surv) {
+ }
+ }
+
++VERBATIM
++double nrn_random_pick(void* r);
++void* nrn_random_arg(int argpos);
++ENDVERBATIM
++
+ PROCEDURE setRNG() {
+ : This function takes a NEURON Random object declared in hoc and makes it usable by
this mod file
+ : The Random must be in uniform(1) mode
+--
+2.38.1
+
diff --git a/python-pynn.spec b/python-pynn.spec
index 0c05c3b..dbf0781 100644
--- a/python-pynn.spec
+++ b/python-pynn.spec
@@ -64,6 +64,8 @@ Patch0: 0001-Disable-nest-extension-build-by-setup.patch
# Merged upstream:
https://github.com/NeuralEnsemble/PyNN/pull/744
Patch1: 0002-fix-correct-sized-import.patch
+Patch2: 0003-Fix-errors-of-type-error-implicit-declaration-of-fun.patch
+
# For extensions
BuildRequires: boost-devel
BuildRequires: cmake
commit cd64a2bf96cc3bb7d18887f8dbe5cb3a659bd135
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Sun Oct 9 17:28:56 2022 +0100
feat: exclude s390x
pyedflib does not support s390x, so the complete dep tree needs to
exclude it too.
diff --git a/python-pynn.spec b/python-pynn.spec
index ee45974..0c05c3b 100644
--- a/python-pynn.spec
+++ b/python-pynn.spec
@@ -54,7 +54,9 @@ Source0: %pypi_source PyNN
# Random123 does not build on these, so neither can NEURON, so nothing that
# depends on NEURON supports them either
#
https://github.com/neuronsimulator/nrn/issues/114
-ExcludeArch: mips64r2 mips32r2
+# 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: mips64r2 mips32r2 s390x
# Disable pynn's way of building extensions
# We do it ourselves
commit 04721ac39c9cc9fb576c82d0ff4a70438aa9f979
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Tue Aug 23 17:36:05 2022 +0900
Rebuild for gsl-2.7.1