diff --git a/test/test_pymbolic.py b/test/test_pymbolic.py index 95182c741f8479884d7b9af9b5d70bf9bd6783be..fe7c8a395b1ad433395d9e0771f6b833ca74884f 100644 --- a/test/test_pymbolic.py +++ b/test/test_pymbolic.py @@ -481,8 +481,8 @@ def test_unifier(): def test_long_sympy_mapping(): + sp = pytest.importorskip("sympy") from pymbolic.interop.sympy import SympyToPymbolicMapper - import sympy as sp SympyToPymbolicMapper()(sp.sympify(int(10**20))) SympyToPymbolicMapper()(sp.sympify(int(10))) diff --git a/test/test_sympy.py b/test/test_sympy.py index f5d294a55e4efbe4e315e498eed3cebb4e89aa20..6f6ff69249ab2d7ad71620b59c166eac73dfe5ce 100644 --- a/test/test_sympy.py +++ b/test/test_sympy.py @@ -23,18 +23,6 @@ THE SOFTWARE. """ import pytest - -from pymbolic.interop.sympy import ( - SympyToPymbolicMapper, PymbolicToSympyMapper) - -try: - from pymbolic.interop.symengine import ( - SymEngineToPymbolicMapper, PymbolicToSymEngineMapper) -except ImportError: - # This will throw if SymEngine isn't installed. - pass - - import pymbolic.primitives as prim x_, y_ = (prim.Variable(s) for s in "x y".split()) @@ -70,13 +58,15 @@ def _test_to_pymbolic(mapper, sym, use_symengine): def test_symengine_to_pymbolic(): sym = pytest.importorskip("symengine.sympy_compat") + from pymbolic.interop.symengine import SymEngineToPymbolicMapper mapper = SymEngineToPymbolicMapper() _test_to_pymbolic(mapper, sym, True) def test_sympy_to_pymbolic(): - import sympy as sym + sym = pytest.importorskip("sympy") + from pymbolic.interop.sympy import SympyToPymbolicMapper mapper = SympyToPymbolicMapper() _test_to_pymbolic(mapper, sym, False) @@ -106,13 +96,15 @@ def _test_from_pymbolic(mapper, sym, use_symengine): def test_pymbolic_to_symengine(): sym = pytest.importorskip("symengine.sympy_compat") + from pymbolic.interop.symengine import PymbolicToSymEngineMapper mapper = PymbolicToSymEngineMapper() _test_from_pymbolic(mapper, sym, True) def test_pymbolic_to_sympy(): - import sympy as sym + sym = pytest.importorskip("sympy") + from pymbolic.interop.sympy import PymbolicToSympyMapper mapper = PymbolicToSympyMapper() _test_from_pymbolic(mapper, sym, False)