1 files changed, 34 insertions(+), 22 deletions(-)

M gnu/packages/machine-learning.scm

@@ 6428,37 6428,49 @@ fi"
 (define-public python-brian2
   (package
     (name "python-brian2")
-    (version "2.5.1")
+    (version "2.10.1")
     (source (origin
               (method url-fetch)
-              (uri (pypi-uri "Brian2" version))
+              (uri (pypi-uri "brian2" version))
               (sha256
                (base32
-                "1g48hzn3cdsvfjgz64s3kvh5d5287ggjxdyacb7wh2n5nd5iqlf7"))))
+                "0kqvw716q26liifjds807nxz17xbzrqwhvyp34j3d4i115xivln1"))))
     (build-system pyproject-build-system)
     (arguments
      (list
+      ;; tests: 104 passed, 2 skipped, 16 warnings
+      #:test-flags
+      ;; Tests hang during collection with higher number of threads.
+      #~(list "--numprocesses" (number->string (min 8 (parallel-job-count)))
+              ;; XXX: The complete test suite is massive, run a simple test
+              ;; that uses the main simulation elements and force code
+              ;; generation to use Cython.
+              "tests/test_synapses.py")
       #:phases
       #~(modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "HOME" "/tmp")
-               ;; Must be run in a different directory, otherwise compiled
-               ;; modules are not found.
-               (with-directory-excursion "/tmp"
-                 ;; Invoking brian2.test() is preferred to running pytest.
-                 (invoke "python" "-c"
-                  "import brian2, sys; sys.exit(0 if brian2.test() else 1)"))))))))
-    (propagated-inputs (list python-cython ; Required by codegen.
-                             python-jinja2
-                             python-numpy
-                             python-py-cpuinfo
-                             python-pyparsing
-                             ;; Required by codegen.
-                             python-setuptools
-                             python-sympy))
-    (native-inputs (list python-pytest python-pytest-xdist python-wheel))
+          (add-after 'unpack 'relax-requirements
+            (lambda _
+              (substitute* "pyproject.toml"
+                ;;     'cython>=0.29.21,<3.1.4',
+                ((">=0.29.21,<3.1.4") ""))))
+          (add-before 'check 'pre-check
+            (lambda _
+              (setenv "HOME" "/tmp")
+              (copy-recursively "brian2/tests" "tests")
+              (delete-file-recursively "brian2"))))))
+    (native-inputs
+     (list python-pytest
+           python-pytest-timeout
+           python-pytest-xdist
+           python-setuptools-scm))
+    (propagated-inputs
+     (list python-cython
+           python-jinja2
+           python-numpy
+           python-packaging
+           python-pyparsing
+           python-setuptools
+           python-sympy))
     (home-page "https://briansimulator.org/")
     (synopsis "Clock-driven simulator for spiking neural networks")
     (description