diff --git a/MANIFEST.in b/MANIFEST.in index f2920b70..2d28f9dc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -13,3 +13,4 @@ prune ipython_examples exclude *.enc exclude upload_api_docs.sh +exclude .readthedocs.yaml diff --git a/scikits/odes/tests/test_dae.py b/scikits/odes/tests/test_dae.py index 2a340a7c..7598f438 100644 --- a/scikits/odes/tests/test_dae.py +++ b/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() diff --git a/scikits/odes/tests/test_dop.py b/scikits/odes/tests/test_dop.py index 1dcb0fc8..9e504d16 100644 --- a/scikits/odes/tests/test_dop.py +++ b/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 diff --git a/scikits/odes/tests/test_odeint.py b/scikits/odes/tests/test_odeint.py index ffed04aa..916a2420 100644 --- a/scikits/odes/tests/test_odeint.py +++ b/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() diff --git a/scikits/odes/tests/test_on_funcs.py b/scikits/odes/tests/test_on_funcs.py index bf6c9a55..9a3f0f45 100644 --- a/scikits/odes/tests/test_on_funcs.py +++ b/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() diff --git a/scikits/odes/tests/test_on_funcs_ida.py b/scikits/odes/tests/test_on_funcs_ida.py index 44fb88fd..db0f4a6c 100644 --- a/scikits/odes/tests/test_on_funcs_ida.py +++ b/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() diff --git a/scikits/odes/tests/test_user_return_vals_cvode.py b/scikits/odes/tests/test_user_return_vals_cvode.py index fcfc758b..ca52fe88 100644 --- a/scikits/odes/tests/test_user_return_vals_cvode.py +++ b/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() diff --git a/scikits/odes/tests/test_user_return_vals_ida.py b/scikits/odes/tests/test_user_return_vals_ida.py index 6ece2a86..c8908ac0 100644 --- a/scikits/odes/tests/test_user_return_vals_ida.py +++ b/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()