Unverified Commit a4b47b68 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #231679 from CedricFinance/brian2-zhf-fix 

python311Packages.brian2: add patch to fix deprecated numpy types
parents 415745e3 be9c774c

pkgs/development/python-modules/brian2/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ buildPythonPackage rec { 
    hash = "sha256-x1EcS7PFCsjPYsq3Lt87SJRW4J5DE/OfdFs3NuyHiLw=";

  };



  patches = [

    # Fix deprecated numpy types

    # https://sources.debian.org/data/main/b/brian/2.5.1-3/debian/patches/numpy1.24.patch

    ./numpy1.24.patch

  ];



  propagatedBuildInputs = [

    cython

    jinja2

pkgs/development/python-modules/brian2/numpy1.24.patch

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Description: Remove deprecated use of np.float

Author: Marcel Stimberg <marcel.stimberg@inserm.fr>

Bug-Debian: https://bugs.debian.org/1027193

Applied-Upstream: 61ef84b316a3d0a892298adf51abd8ac50900758

Last-Update: 2023-01-06

---

This patch header follows DEP-3: http://dep.debian.net/deps/dep3/

--- brian.orig/brian2/units/fundamentalunits.py

+++ brian/brian2/units/fundamentalunits.py

@@ -1597,7 +1597,7 @@

         unitless = np.array(self / best_unit, copy=False)

         threshold = np.get_printoptions()['threshold'] // 100

         if unitless.ndim == 0:

-            sympy_quantity = np.float(unitless)

+            sympy_quantity = float(unitless)

         elif unitless.ndim == 1:

             array_str = np.array2string(unitless, separator=" & ", threshold=threshold,

                                         max_line_width=sys.maxsize)