Remove deprecated pulse-builder contexts (Qiskit#8697)

* Remove qiskit.pulse.builder.inline as deprecated in 0.18.0 (2021-07-13) * remove imports * remove test * Remove qiskit.pulse.builder.pad as deprecated in 0.18.0 (2021-07-13) * reno * Reword removal note Co-authored-by: Jake Lishman <[email protected]>
ewinston · Sep 8, 2022 · bb41815 · bb41815
1 parent ee0a4f1
commit bb41815
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 84 deletions.
diff --git a/qiskit/pulse/__init__.py b/qiskit/pulse/__init__.py
@@ -92,8 +92,6 @@
     align_sequential,
     circuit_scheduler_settings,
     frequency_offset,
-    inline,
-    pad,
     phase_offset,
     transpiler_settings,
     # Macros.

diff --git a/qiskit/pulse/builder.py b/qiskit/pulse/builder.py
@@ -339,8 +339,6 @@
     align_sequential
     circuit_scheduler_settings
     frequency_offset
-    inline
-    pad
     phase_offset
     transpiler_settings
 
@@ -442,7 +440,6 @@
 import contextvars
 import functools
 import itertools
-import warnings
 from contextlib import contextmanager
 from typing import (
     Any,
@@ -473,7 +470,6 @@
     macros,
     library,
     transforms,
-    utils,
 )
 from qiskit.pulse.instructions import directives
 from qiskit.pulse.schedule import Schedule, ScheduleBlock
@@ -1372,62 +1368,6 @@ def general_transforms(alignment_context: AlignmentKind) -> ContextManager[None]
         builder.append_block(current)
 
 
-@utils.deprecated_functionality
-@contextmanager
-def inline() -> ContextManager[None]:
-    """Deprecated. Inline all instructions within this context into the parent context,
-    inheriting the scheduling policy of the parent context.
-
-    .. warning:: This will cause all scheduling directives within this context
-        to be ignored.
-    """
-
-    def _flatten(block):
-        for inst in block.blocks:
-            if isinstance(inst, ScheduleBlock):
-                yield from _flatten(inst)
-            else:
-                yield inst
-
-    builder = _active_builder()
-
-    # set a placeholder
-    builder.push_context(transforms.AlignLeft())
-    try:
-        yield
-    finally:
-        placeholder = builder.pop_context()
-        for inst in _flatten(placeholder):
-            builder.append_instruction(inst)
-
-
-@contextmanager
-def pad(*chs: chans.Channel) -> ContextManager[None]:  # pylint: disable=unused-argument
-    """Deprecated. Pad all available timeslots with delays upon exiting context.
-
-    Args:
-        chs: Channels to pad with delays. Defaults to all channels in context
-            if none are supplied.
-
-    Yields:
-        None
-    """
-    warnings.warn(
-        "Context-wise padding is being deprecated. Requested padding is being ignored. "
-        "Now the pulse builder generate a program in `ScheduleBlock` representation. "
-        "The padding with delay as a blocker is no longer necessary for this program. "
-        "However, if you still want delays, you can convert the output program "
-        "into `Schedule` representation by calling "
-        "`qiskit.pulse.transforms.target_qobj_transform`. Then, you can apply "
-        "`qiskit.pulse.transforms.pad` to the converted schedule. ",
-        DeprecationWarning,
-    )
-    try:
-        yield
-    finally:
-        pass
-
-
 @contextmanager
 def transpiler_settings(**settings) -> ContextManager[None]:
     """Set the currently active transpiler settings for this context.

diff --git a/releasenotes/notes/qiskit.pulse.builder-ddefe88dca5765b9.yaml b/releasenotes/notes/qiskit.pulse.builder-ddefe88dca5765b9.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The ``qiskit.pulse.builder`` contexts ``inline`` and ``pad`` have been
+    removed.  These were first deprecated in Terra 0.18.0 (July 2021).  There is
+    no replacement for ``inline``; one can simply write the pulses in the
+    containing scope.  The ``pad`` context manager has had no effect since it
+    was deprecated.
diff --git a/test/python/pulse/test_builder.py b/test/python/pulse/test_builder.py
@@ -184,28 +184,6 @@ def test_align_right(self):
 
         self.assertScheduleEqual(schedule, reference)
 
-    def test_inline(self):
-        """Test the inlining context."""
-        d0 = pulse.DriveChannel(0)
-        d1 = pulse.DriveChannel(1)
-
-        with pulse.build() as schedule:
-            pulse.delay(3, d0)
-            with pulse.inline():
-                # this alignment will be ignored due to inlining.
-                with pulse.align_right():
-                    pulse.delay(5, d1)
-                    pulse.delay(7, d0)
-
-        reference = pulse.Schedule()
-        # d0
-        reference += instructions.Delay(3, d0)
-        reference += instructions.Delay(7, d0)
-        # d1
-        reference += instructions.Delay(5, d1)
-
-        self.assertScheduleEqual(schedule, reference)
-
     def test_transpiler_settings(self):
         """Test the transpiler settings context.