examples: cleanup pytest imports

devito/__init__.py

@@ -1,7 +1,6 @@
 import atexit
 from itertools import product
 import os
-from . import _version
 
 import numpy as np
 
@@ -195,9 +194,5 @@ def mode_performance():
 # job properly and thus we may end up missing some custom __del__'s
 atexit.register(clear_cache)
 
-
-__version__ = _version.get_versions()['version']
-
-
 # Clean up namespace
 del atexit, product

devito/types/basic.py

@@ -985,8 +985,9 @@ def __init_finalize__(self, *args, **kwargs):
 
         # Averaging mode for off the grid evaluation
         self._avg_mode = kwargs.get('avg_mode', 'arithmetic')
-        assert self._avg_mode in ['arithmetic', 'harmonic'], "Accepted avg_mode " \
-            "values are 'arithmetic' or 'harmonic', invalid %s" % self._avg_mode
+        if self._avg_mode not in ['arithmetic', 'harmonic']:
+            raise ValueError("Invalid averaging mode_mode %s, accepted values are"
+                             " arithmetic or harmonic" % self._avg_mode)
 
     @classmethod
     def __args_setup__(cls, *args, **kwargs):
@@ -1152,10 +1153,13 @@ def _evaluate(self, **kwargs):
             return self
 
         # Base function
-        retval = 1 / self.function if self._avg_mode == 'harmonic' else self.function
+        if self._avg_mode == 'harmonic':
+            retval = 1 / self.function
+        else:
+            retval = self.function
         # Apply interpolation from inner most dim
         for d, i in self._grid_map.items():
-            retval = retval.diff(d, deriv_order=0, fd_order=2, x0={d: i}).evaluate
+            retval = retval.diff(d, deriv_order=0, fd_order=2, x0={d: i})
         if self._avg_mode == 'harmonic':
             retval = 1 / retval
 

examples/seismic/acoustic/acoustic_example.py

@@ -1,7 +1,7 @@
 import numpy as np
 try:
     import pytest
-except:
+except ImportError:
     pass
 
 from devito.logger import info

examples/seismic/elastic/elastic_example.py

@@ -1,7 +1,7 @@
 import numpy as np
 try:
     import pytest
-except:
+except ImportError:
     pass
 from devito import norm
 from devito.logger import info

examples/seismic/tti/tti_example.py

@@ -1,7 +1,7 @@
 import numpy as np
 try:
     import pytest
-except:
+except ImportError:
     pass
 
 from devito import Function, smooth, norm, info, Constant

examples/seismic/viscoacoustic/viscoacoustic_example.py

@@ -1,7 +1,7 @@
 import numpy as np
 try:
     import pytest
-except:
+except ImportError:
     pass
 
 from devito.logger import info

examples/seismic/viscoelastic/viscoelastic_example.py

@@ -1,7 +1,7 @@
 import numpy as np
 try:
     import pytest
-except:
+except ImportError:
     pass
 
 from devito import norm