Fix deprecated imports from numpy.testing.utils

brian-team · Oct 5, 2023 · dde7b44 · dde7b44
1 parent 5b461fa
commit dde7b44
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/brian2modelfitting/tests/test_metric.py b/brian2modelfitting/tests/test_metric.py
@@ -4,7 +4,7 @@
 import pytest
 
 import numpy as np
-from numpy.testing.utils import assert_equal, assert_raises, assert_almost_equal
+from numpy.testing import assert_equal, assert_raises, assert_almost_equal
 from brian2 import ms, mV
 from brian2.units.fundamentalunits import DimensionMismatchError
 from brian2modelfitting import (FeatureMetric, MSEMetric, GammaFactor,

diff --git a/brian2modelfitting/tests/test_modelfitting_spikefitter.py b/brian2modelfitting/tests/test_modelfitting_spikefitter.py
@@ -3,7 +3,7 @@
 '''
 import pytest
 import numpy as np
-from numpy.testing.utils import assert_equal
+from numpy.testing import assert_equal
 from brian2 import (Equations, NeuronGroup, SpikeMonitor, TimedArray,
                     nS, nF, mV, ms, nA, amp, run)
 from brian2modelfitting import (NevergradOptimizer, SpikeFitter, GammaFactor,

diff --git a/brian2modelfitting/tests/test_optimizer.py b/brian2modelfitting/tests/test_optimizer.py
@@ -2,7 +2,7 @@
 Test the optimizer class
 '''
 import numpy as np
-from numpy.testing.utils import assert_equal, assert_raises
+from numpy.testing import assert_equal, assert_raises
 from brian2modelfitting import Optimizer, NevergradOptimizer, SkoptOptimizer, calc_bounds
 
 from skopt import Optimizer as SOptimizer

diff --git a/brian2modelfitting/tests/test_simulation_runtime.py b/brian2modelfitting/tests/test_simulation_runtime.py
@@ -3,7 +3,7 @@
 '''
 import pytest
 import numpy as np
-from numpy.testing.utils import assert_equal, assert_raises
+from numpy.testing import assert_equal, assert_raises
 from brian2 import (Equations, NeuronGroup, StateMonitor, Network, ms,
                     start_scope, mV)
 from brian2.devices.device import Dummy

diff --git a/brian2modelfitting/tests/test_simulation_standalone.py b/brian2modelfitting/tests/test_simulation_standalone.py
@@ -3,7 +3,7 @@
 '''
 import pytest
 import numpy as np
-from numpy.testing.utils import assert_equal, assert_raises
+from numpy.testing import assert_equal, assert_raises
 from brian2 import (Equations, NeuronGroup, StateMonitor, Network, ms,
                     device, start_scope)
 from brian2.devices.device import Dummy

diff --git a/brian2modelfitting/tests/test_utils.py b/brian2modelfitting/tests/test_utils.py
@@ -3,9 +3,9 @@
 '''
 import tqdm
 from brian2modelfitting import (callback_text, callback_setup, make_dic,
-                               callback_none)
+                                callback_none)
 from brian2modelfitting.utils import ProgressBar
-from numpy.testing.utils import assert_equal
+from numpy.testing import assert_equal
 
 
 def test_callback_text(capsys):