diff --git a/.test-py2.yml b/.test-py2.yml index 69302088d5635226b9b4c19dd9f877e074aa9f11..b53749ce7da5175cb6991aefae8f92244e7fb037 100644 --- a/.test-py2.yml +++ b/.test-py2.yml @@ -1,6 +1,6 @@ name: py2 channels: - - symengine/label/dev + - symengine - conda-forge - defaults dependencies: @@ -9,5 +9,5 @@ dependencies: - conda-forge::numpy - conda-forge::sympy - python=2.7 - - symengine/label/dev::python-symengine=0.2.0.53.g83912b7=py27_1 + - symengine::python-symengine=0.3.0 - maxima diff --git a/.test-py3.yml b/.test-py3.yml index 24910d55b676a0c7f6c21922a4b0ec6169d17b98..57ec950a9b44ca17e9b253d8db3b70fa8e733e43 100644 --- a/.test-py3.yml +++ b/.test-py3.yml @@ -1,6 +1,6 @@ name: py3 channels: - - symengine/label/dev + - symengine - conda-forge - defaults dependencies: @@ -8,5 +8,5 @@ dependencies: - conda-forge::numpy - conda-forge::sympy - python=3.5 - - symengine/label/dev::python-symengine=0.2.0.53.g83912b7=py35_1 + - symengine::python-symengine=0.3.0 - maxima diff --git a/pymbolic/interop/symengine.py b/pymbolic/interop/symengine.py index ab68e7fde1596e390ad59e55b40827589d9c6f80..c0d1c06892bc7e870b131357f04754599fab103e 100644 --- a/pymbolic/interop/symengine.py +++ b/pymbolic/interop/symengine.py @@ -28,7 +28,7 @@ from pymbolic.interop.common import ( SympyLikeToPymbolicMapper, PymbolicToSympyLikeMapper) import pymbolic.primitives as prim -import symengine.sympy_compat +import symengine __doc__ = """ @@ -84,7 +84,7 @@ class SymEngineToPymbolicMapper(SympyLikeToPymbolicMapper): class PymbolicToSymEngineMapper(PymbolicToSympyLikeMapper): - sym = symengine.sympy_compat + sym = symengine def raise_conversion_error(self, expr): raise RuntimeError( diff --git a/test/test_sympy.py b/test/test_sympy.py index 6f6ff69249ab2d7ad71620b59c166eac73dfe5ce..5415cb6227b82978dbc774d1a50075d8eca2cc6f 100644 --- a/test/test_sympy.py +++ b/test/test_sympy.py @@ -36,11 +36,16 @@ def _test_to_pymbolic(mapper, sym, use_symengine): assert mapper(sym.Rational(3, 4)) == prim.Quotient(3, 4) assert mapper(sym.Integer(6)) == 6 - assert mapper(sym.Subs(x**2, (x,), (y,))) == \ - prim.Substitution(x_**2, ("x",), (y_,)) - # FIXME in symengine - deriv = sym.Derivative(x**2, (x,)) if use_symengine else sym.Derivative(x**2, x) - assert mapper(deriv) == prim.Derivative(x_**2, ("x",)) + if not use_symengine: + assert mapper(sym.Subs(x**2, (x,), (y,))) == \ + prim.Substitution(x_**2, ("x",), (y_,)) + deriv = sym.Derivative(x**2, x) + assert mapper(deriv) == prim.Derivative(x_**2, ("x",)) + else: + assert mapper(sym.Subs(x**2, (x,), (y,))) == \ + y_**2 + deriv = sym.Derivative(x**2, x) + assert mapper(deriv) == 2*x_ # functions assert mapper(sym.Function("f")(x)) == prim.Variable("f")(x_) @@ -57,7 +62,7 @@ def _test_to_pymbolic(mapper, sym, use_symengine): def test_symengine_to_pymbolic(): - sym = pytest.importorskip("symengine.sympy_compat") + sym = pytest.importorskip("symengine") from pymbolic.interop.symengine import SymEngineToPymbolicMapper mapper = SymEngineToPymbolicMapper() @@ -83,8 +88,7 @@ def _test_from_pymbolic(mapper, sym, use_symengine): assert mapper(prim.Substitution(x_**2, ("x",), (y_,))) == \ sym.Subs(x**2, (x,), (y,)) - # FIXME in symengine - deriv = sym.Derivative(x**2, (x,)) if use_symengine else sym.Derivative(x**2, x) + deriv = sym.Derivative(x**2, x) assert mapper(prim.Derivative(x_**2, ("x",))) == deriv assert mapper(x_[0]) == sym.Symbol("x_0") @@ -95,7 +99,7 @@ def _test_from_pymbolic(mapper, sym, use_symengine): def test_pymbolic_to_symengine(): - sym = pytest.importorskip("symengine.sympy_compat") + sym = pytest.importorskip("symengine") from pymbolic.interop.symengine import PymbolicToSymEngineMapper mapper = PymbolicToSymEngineMapper()