Minor tweaks to reduce/improve test warnings

pyNN/nest/cells.py

@@ -43,7 +43,7 @@ def get_defaults(model_name):
             if isinstance(value, valid_types):
                 default_params[name] = conversion.make_pynn_compatible(value)
             else:
-                warnings.warn("Ignoring parameter '%s' since PyNN does not support %s" %
+                warnings.warn("Ignoring default NEST parameter '%s' since PyNN parameteres cannot be of type %s" %
                               (name, type(value)))
     return default_params, default_initial_values
 

test/system/scenarios/test_cell_types.py

@@ -1,4 +1,4 @@
-
+import sys
 import numpy as np
 try:
     import scipy
@@ -34,7 +34,8 @@ def test_EIF_cond_alpha_isfa_ista(sim, plot_figure=False):
             expected_spike_times) / expected_spike_times
     assert abs(diff).max() < 0.01, abs(diff).max()
     sim.end()
-    return data
+    if "pytest" not in sys.modules:
+        return data
 
 
 @run_with_simulators("nest", "neuron", "brian2")
@@ -98,7 +99,8 @@ def issue367(sim, plot_figure=False):
                                                                    vm_before_spike.mean())
     assert abs((vm_before_spike.mean() - v_thresh) / v_thresh) < 0.01, err_msg
     sim.end()
-    return data
+    if "pytest" not in sys.modules:
+        return data
 
 
 @run_with_simulators("nest", "neuron", "brian2")
@@ -146,8 +148,8 @@ def test_SpikeSourcePoisson(sim, plot_figure=False):
                       alternative='two-sided')
         print(expected_rate, expected_mean_isi, isi.mean(), p, D)
         assert D < 0.1
-
-    return data
+    if "pytest" not in sys.modules:
+        return data
 
 
 @run_with_simulators("nest", "neuron")
@@ -203,7 +205,8 @@ def test_SpikeSourceGamma(sim, plot_figure=False):
         print(alpha, beta, expected_mean_isi, isi.mean(), p, D)
         assert D < 0.1
 
-    return data
+    if "pytest" not in sys.modules:
+        return data
 
 
 @run_with_simulators("nest", "neuron")
@@ -261,7 +264,8 @@ def test_SpikeSourcePoissonRefractory(sim, plot_figure=False):
         print(expected_rate, poisson_mean_isi, corrected_isi.mean(), p, D)
         assert D < 0.1
 
-    return data
+    if "pytest" not in sys.modules:
+        return data
 
 
 @run_with_simulators("nest", "neuron", "brian2")

test/system/scenarios/test_scenario2.py

@@ -1,4 +1,4 @@
-
+import sys
 import numpy as np
 from .fixtures import run_with_simulators
 
@@ -54,7 +54,8 @@ def test_scenario2(sim):
     print("max error =", max_error)
     assert max_error < 0.005, max_error
     sim.end()
-    return a, b, spike_times
+    if "pytest" not in sys.modules:
+        return a, b, spike_times
 
 
 if __name__ == '__main__':

test/system/scenarios/test_scenario3.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+import sys
 from pyNN.utility import init_logging
 from pyNN.random import RandomDistribution
 from .fixtures import run_with_simulators
@@ -92,7 +93,8 @@ def test_scenario3(sim):
     assert p < 0.01, p
     assert final_weights[:50, :].mean() < final_weights[50:, :].mean()
     sim.end()
-    return initial_weights, final_weights, pre, post, connections
+    if "pytest" not in sys.modules:
+        return initial_weights, final_weights, pre, post, connections
 
 
 if __name__ == '__main__':

test/system/scenarios/test_scenario4.py

@@ -1,6 +1,7 @@
 
 
 import logging
+import sys
 from pyNN.random import NumpyRNG, RandomDistribution
 from pyNN.space import Space, Grid3D, RandomStructure, Cuboid
 from pyNN.utility import init_logging
@@ -58,7 +59,8 @@ def test_scenario4(sim):
     sim.run(1000.0)
     data = outputs.get_data()
     sim.end()
-    return data
+    if "pytest" not in sys.modules:
+        return data
 
 
 if __name__ == '__main__':

test/system/scenarios/test_synapse_types.py

@@ -1,4 +1,5 @@
 
+import sys
 import numpy as np
 from .fixtures import run_with_simulators
 
@@ -38,7 +39,8 @@ def test_simple_stochastic_synapse(sim, plot_figure=False):
     assert crossings[3].size == spike_times.size
     assert not np.array_equal(crossings[1], crossings[2])
     print(crossings[1].size / spike_times.size)
-    return data
+    if "pytest" not in sys.modules:
+        return data
 
 
 if __name__ == '__main__':