Merge pull request #153 from aragilar/remove-numpy-test-runner

Remove numpy test runner imports

MANIFEST.in

@@ -13,3 +13,4 @@ prune ipython_examples
 
 exclude *.enc
 exclude upload_api_docs.sh
+exclude .readthedocs.yaml

scikits/odes/tests/test_dae.py

@@ -11,7 +11,7 @@
 from numpy import (arange, zeros, array, dot, sqrt, cos, sin, allclose,
                    empty)
 
-from numpy.testing import TestCase, run_module_suite
+from numpy.testing import TestCase
 from scipy.integrate import ode as Iode
 from scikits.odes import ode,dae
 from scikits.odes.sundials import _get_num_args
@@ -392,17 +392,3 @@ def verify(self, y, yp, t):
     SimpleOscillator,
     StiffVODECompare,
 ]
-#------------------------------------------------------------------------------
-
-if __name__ == "__main__":
-    try:
-        run_module_suite()
-    except NameError:
-        test = TestDae()
-        test.test_ddaspk()
-        test.test_lsodi()
-        test.test_ida_old_api()
-        test.test_ida()
-        test = TestGetNumArgs()
-        test.test_functions()
-        test.test_methods()

scikits/odes/tests/test_dop.py

@@ -10,7 +10,7 @@
 import numpy as np
 
 from numpy.testing import (
-    assert_, TestCase, run_module_suite, assert_array_almost_equal,
+    assert_, TestCase, assert_array_almost_equal,
     assert_raises, assert_allclose, assert_array_equal, assert_equal)
 from scikits.odes import ode
 from scikits.odes.dopri5 import StatusEnumDOP

scikits/odes/tests/test_odeint.py

@@ -16,7 +16,7 @@
                    allclose)
 
 from numpy.testing import (
-    assert_, TestCase, run_module_suite, assert_array_almost_equal,
+    assert_, TestCase, assert_array_almost_equal,
     assert_raises, assert_allclose, assert_array_equal, assert_equal)
 
 from scikits.odes.odeint import odeint
@@ -447,7 +447,3 @@ def badjac(t, x, fx, J):
 
     # shape of array returned by badjac(x, t) is not correct.
     assert_raises(ValueError, odeint, sys1, [0, 1], [10, 10], jacfn=badjac)
-
-
-if __name__ == "__main__":
-    run_module_suite()

scikits/odes/tests/test_on_funcs.py

@@ -10,7 +10,7 @@
 from numpy import (arange, zeros, array, dot, sqrt, cos, sin, allclose,
                     empty)
 
-from numpy.testing import TestCase, run_module_suite
+from numpy.testing import TestCase
 
 from scikits.odes import ode
 from scikits.odes.sundials.cvode import StatusEnum
@@ -311,18 +311,3 @@ def test_cvode_tstopfn_test(self):
         assert allclose([soln.tstop.t[-1], soln.tstop.y[-1,0], soln.tstop.y[-1,1]],
                         [30.0, -1452.5024, -294.30],
                         atol=atol, rtol=rtol)
-if __name__ == "__main__":
-    try:
-        run_module_suite()
-    except NameError:
-        test = TestOn()
-        test.test_cvode_rootfn_noroot()
-        test.test_cvode_rootfn()
-        test.test_cvode_rootfnacc()
-        test.test_cvode_rootfn_stop()
-        test.test_cvode_rootfn_test()
-        test.test_cvode_tstopfn()
-        test.test_cvode_tstopfn_notstop()
-        test.test_cvode_tstopfn_stop()
-        test.test_cvode_tstopfn_test()
-        test.test_cvode_tstopfnacc()

scikits/odes/tests/test_on_funcs_ida.py

@@ -10,7 +10,7 @@
 from numpy import (arange, zeros, array, dot, sqrt, cos, sin, allclose,
                     empty)
 
-from numpy.testing import TestCase, run_module_suite
+from numpy.testing import TestCase
 
 from scikits.odes import dae
 from scikits.odes.sundials.ida import StatusEnumIDA
@@ -312,13 +312,3 @@ def test_ida_tstopfn_test(self):
         assert allclose([soln.tstop.t[-1], soln.tstop.y[-1,0], soln.tstop.y[-1,1]],
                         [30.0, -1452.5024, -294.30],
                         atol=atol, rtol=rtol)
-if __name__ == "__main__":
-    try:
-        run_module_suite()
-    except NameError:
-        test = TestOn()
-        test.test_ida_rootfn_noroot()
-        test.test_ida_rootfn()
-        test.test_ida_rootfnacc()
-        test.test_ida_rootfn_stop()
-        test.test_ida_rootfn_test()

scikits/odes/tests/test_user_return_vals_cvode.py

@@ -1,5 +1,5 @@
 
-from numpy.testing import TestCase, run_module_suite
+from numpy.testing import TestCase
 
 from .. import ode
 from ..sundials.cvode import StatusEnum
@@ -315,10 +315,3 @@ class TestCVodesReturn(TestCVodeReturn):
     def __init__(self, *args, **kwargs):
         super(TestCVodesReturn, self).__init__(*args, **kwargs)
         self.solvername = "cvodes"
-
-if __name__ == "__main__":
-    try:
-        run_module_suite()
-    except NameError:
-        test = TestCVodeReturn()
-        TestCVodeReturn.test_normal_rhs()

scikits/odes/tests/test_user_return_vals_ida.py

@@ -1,5 +1,5 @@
 
-from numpy.testing import TestCase, run_module_suite
+from numpy.testing import TestCase
 
 from .. import dae
 from ..sundials.ida import StatusEnumIDA
@@ -238,10 +238,3 @@ class TestIdasReturn(TestIdaReturn):
     def __init__(self, *args, **kwargs):
         super(TestIdasReturn, self).__init__(*args, **kwargs)
         self.solvername = "idas"
-
-if __name__ == "__main__":
-    try:
-        run_module_suite()
-    except NameError:
-        test = TestIdaReturn()
-        test.test_normal_rhs()