diff --git a/test/python/pulse/test_pulse_lib.py b/test/python/pulse/test_pulse_lib.py index 51809538503a..41bb823867af 100644 --- a/test/python/pulse/test_pulse_lib.py +++ b/test/python/pulse/test_pulse_lib.py @@ -15,6 +15,7 @@ import unittest from unittest.mock import patch import numpy as np +import symengine as sym from qiskit.circuit import Parameter from qiskit.pulse.library import ( @@ -39,12 +40,6 @@ from qiskit.pulse import functional_pulse, PulseError from qiskit.test import QiskitTestCase -from qiskit.utils import optionals as _optional - -if _optional.HAS_SYMENGINE: - import symengine as sym -else: - import sympy as sym class TestWaveform(QiskitTestCase): diff --git a/test/python/qpy/test_block_load_from_qpy.py b/test/python/qpy/test_block_load_from_qpy.py index 321e018d5a64..807ccd489c0a 100644 --- a/test/python/qpy/test_block_load_from_qpy.py +++ b/test/python/qpy/test_block_load_from_qpy.py @@ -17,6 +17,7 @@ from ddt import ddt, data, unpack import numpy as np +import symengine as sym from qiskit.pulse import builder, Schedule from qiskit.pulse.library import ( @@ -43,12 +44,6 @@ from qiskit.pulse.configuration import Kernel, Discriminator -if _optional.HAS_SYMENGINE: - import symengine as sym -else: - import sympy as sym - - class QpyScheduleTestCase(QiskitTestCase): """QPY schedule testing platform.""" diff --git a/test/qpy_compat/test_qpy.py b/test/qpy_compat/test_qpy.py index 0dde32e10fb6..a4e2b9e09f78 100755 --- a/test/qpy_compat/test_qpy.py +++ b/test/qpy_compat/test_qpy.py @@ -427,7 +427,6 @@ def generate_control_flow_switch_circuits(): def generate_schedule_blocks(): """Standard QPY testcase for schedule blocks.""" from qiskit.pulse import builder, channels, library - from qiskit.utils import optionals current_version = current_version_str.split(".") for i in range(len(current_version[2])): @@ -469,10 +468,8 @@ def generate_schedule_blocks(): builder.acquire(1000, channels.AcquireChannel(0), channels.MemorySlot(0)) schedule_blocks.append(block) # Raw symbolic pulse - if optionals.HAS_SYMENGINE: - import symengine as sym - else: - import sympy as sym + import symengine as sym + duration, amp, t = sym.symbols("duration amp t") # pylint: disable=invalid-name expr = amp * sym.sin(2 * sym.pi * t / duration) my_pulse = library.SymbolicPulse(