Merge pull request #173 from isuruf/test

Have proper test skipping

Author: isuruf

symengine/lib/symengine_wrapper.pyx

@@ -450,7 +450,15 @@ def _sympify(a, raise_error=True):
         return _sympify(a._sympy_(), raise_error)
     elif hasattr(a, 'pyobject'):
         return _sympify(a.pyobject(), raise_error)
-    return sympy2symengine(a, raise_error)
+
+    try:
+        import sympy
+        return sympy2symengine(a, raise_error)
+    except ImportError:
+        pass
+
+    if raise_error:
+        raise SympifyError("sympify: Cannot convert '%r' to a symengine type." % a)
 
 funcs = {}
 
@@ -604,6 +612,9 @@ cdef class Basic(object):
     def __dealloc__(self):
         self.thisptr.reset()
 
+    def _unsafe_reset(self):
+        self.thisptr.reset()
+
     def __add__(a, b):
         cdef Basic A = _sympify(a, False)
         B_ = _sympify(b, False)
@@ -2969,6 +2980,7 @@ false = c2py(symengine.boolFalse)
 
 def module_cleanup():
     global I, E, pi, oo, zoo, nan, true, false, GoldenRatio, Catalan, EulerGamma, sympy_module, sage_module
+    funcs.clear()
     del I, E, pi, oo, zoo, nan, true, false, GoldenRatio, Catalan, EulerGamma, sympy_module, sage_module
 
 import atexit

symengine/tests/test_eval.py

@@ -2,7 +2,7 @@
 from symengine import (Symbol, sin, cos, Integer, Add, I, RealDouble, ComplexDouble, sqrt)
 
 from symengine.lib.symengine_wrapper import eval_double
-
+from unittest.case import SkipTest
 
 def test_eval_double1():
     x = Symbol("x")
@@ -34,6 +34,8 @@ def test_n():
     y = 1.0 + 2.0*I
     assert x.n() == y
 
+
+def test_n_mpfr():
     try:
         from symengine import RealMPFR
         x = sqrt(Integer(2))
@@ -42,7 +44,10 @@ def test_n():
     except ImportError:
         x = sqrt(Integer(2))
         raises(ValueError, lambda: (x.n(75, real=True)))
+        raise SkipTest("No MPFR support")
+
 
+def test_n_mpc():
     try:
         from symengine import ComplexMPC
         x = sqrt(Integer(2)) + 3*I
@@ -51,6 +56,7 @@ def test_n():
     except ImportError:
         x = sqrt(Integer(2))
         raises(ValueError, lambda: (x.n(75)))
+        raise SkipTest("No MPC support")
 
 
 def test_rel():

symengine/tests/test_functions.py

@@ -6,6 +6,16 @@
                                             polygamma, digamma, trigamma, EulerGamma, sign,
                                             floor, ceiling, conjugate, nan, Float)
 
+import unittest
+
+try:
+    import sympy
+    from sympy.core.cache import clear_cache
+    import atexit
+    atexit.register(clear_cache)
+    have_sympy = True
+except ImportError:
+    have_sympy = False
 
 def test_sin():
     x = Symbol("x")
@@ -110,6 +120,7 @@ def test_Subs():
     assert s.point == (2*x,)
 
 
+@unittest.skipUnless(have_sympy, "SymPy not installed")
 def test_FunctionWrapper():
     import sympy
     n, m, theta, phi = sympy.symbols("n, m, theta, phi")