Move over to pytest based runtests

anuga-community · May 19, 2022 · 64b1cf7 · 64b1cf7
1 parent cc2bcc1
commit 64b1cf7
Show file tree

Hide file tree

Showing 26 changed files with 524 additions and 202 deletions.
diff --git a/anuga/__init__.py b/anuga/__init__.py
@@ -34,10 +34,11 @@
 _stdout = sys.stdout
 
 # ---------------------------------
-# Setup the nose tester from numpy
+# Setup the tester from numpy
 # ---------------------------------
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
 #from anuga.__config__ import show as show_config
 

diff --git a/anuga/abstract_2d_finite_volumes/__init__.py b/anuga/abstract_2d_finite_volumes/__init__.py
@@ -6,10 +6,10 @@
     mesh. 
 """
 
-from numpy.testing import Tester
-test = Tester().test
-
 
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
 
 

diff --git a/anuga/alpha_shape/__init__.py b/anuga/alpha_shape/__init__.py
@@ -1,4 +1,5 @@
-#nothing
 
-from numpy.testing import Tester
-test = Tester().test
+
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
diff --git a/anuga/caching/__init__.py b/anuga/caching/__init__.py
@@ -6,13 +6,13 @@
     If the function is called with identical parameters in the future, the
     cached result will be returned.
 """
-from __future__ import absolute_import
+from __future__ import absolute_import
 
 from .caching import *
 
-
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
 
 

diff --git a/anuga/coordinate_transforms/__init__.py b/anuga/coordinate_transforms/__init__.py
@@ -1,7 +1,8 @@
-from __future__ import absolute_import
+from __future__ import absolute_import
 
 from .redfearn import *
 from .point import *
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
diff --git a/anuga/culvert_flows/__init__.py b/anuga/culvert_flows/__init__.py
@@ -1,8 +1,9 @@
 """Make directory available as a Python package
 """
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
 
 

diff --git a/anuga/damage_modelling/__init__.py b/anuga/damage_modelling/__init__.py
@@ -1,9 +1,8 @@
 """Make directory available as a Python package
 """
 
-from numpy.testing import Tester
-test = Tester().test
-
-
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
 
diff --git a/anuga/file/__init__.py b/anuga/file/__init__.py
@@ -48,7 +48,7 @@
 TSH + Boundary SWW -> SWW: Simluation using abstract_2d_finite_volumes    
 """
 
-from numpy.testing import Tester
-test = Tester().test
-
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
diff --git a/anuga/file_conversion/__init__.py b/anuga/file_conversion/__init__.py
@@ -13,8 +13,8 @@
     Where an array of 3 input files produce 4 output files.
 """
 
-from numpy.testing import Tester
-test = Tester().test
-
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
 
diff --git a/anuga/fit_interpolate/__init__.py b/anuga/fit_interpolate/__init__.py
@@ -5,7 +5,10 @@
     data over the mesh, and allows data to be sampled at any given point.
 """
 
-pass
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
+
 
 
 

diff --git a/anuga/geometry/__init__.py b/anuga/geometry/__init__.py
@@ -5,7 +5,9 @@
 """
 
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
+
 
 
diff --git a/anuga/geospatial_data/__init__.py b/anuga/geospatial_data/__init__.py
@@ -4,6 +4,7 @@
 from anuga.geospatial_data.geospatial_data import *
 
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
diff --git a/anuga/lib/__init__.py b/anuga/lib/__init__.py
@@ -1,8 +1,9 @@
 """Make directory available as a Python package
 """
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
 
 

diff --git a/anuga/load_mesh/__init__.py b/anuga/load_mesh/__init__.py
@@ -1,4 +1,5 @@
 #nothing
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
diff --git a/anuga/mesh_engine/__init__.py b/anuga/mesh_engine/__init__.py
@@ -1,4 +1,5 @@
 #nothing
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
diff --git a/anuga/operators/__init__.py b/anuga/operators/__init__.py
@@ -3,8 +3,10 @@
     
 """
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
+
 
 
 

diff --git a/anuga/parallel/__init__.py b/anuga/parallel/__init__.py
@@ -7,9 +7,9 @@
 from __future__ import absolute_import
 
 
-
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
 
 from .parallel_api import distribute

diff --git a/anuga/pmesh/__init__.py b/anuga/pmesh/__init__.py
@@ -1,4 +1,6 @@
 #nothing
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
+
diff --git a/anuga/rain/__init__.py b/anuga/rain/__init__.py
@@ -1,5 +1,6 @@
 
 
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
diff --git a/anuga/shallow_water/__init__.py b/anuga/shallow_water/__init__.py
@@ -5,8 +5,9 @@
     extra boundary classes to do with this specific domain.
 """
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
 
 
diff --git a/anuga/simulation/__init__.py b/anuga/simulation/__init__.py
@@ -5,5 +5,6 @@
 
 """
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
diff --git a/anuga/structures/__init__.py b/anuga/structures/__init__.py
@@ -1,5 +1,6 @@
 
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
diff --git a/anuga/tsunami_source/__init__.py b/anuga/tsunami_source/__init__.py
@@ -5,8 +5,10 @@
     extra boundary classes to do with this specific domain.
 """
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
+
 
 
 

diff --git a/anuga/utilities/__init__.py b/anuga/utilities/__init__.py
@@ -5,7 +5,9 @@
     mathematical and programming idioms.
 """
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
+
 
 
diff --git a/anuga/validation_utilities/__init__.py b/anuga/validation_utilities/__init__.py
@@ -3,8 +3,9 @@
 """
 from __future__ import absolute_import
 
-from numpy.testing import Tester
-test = Tester().test
+from numpy._pytesttester import PytestTester
+test = PytestTester(__name__)
+del PytestTester
 
 
 from .typeset_report import typeset_report