Deprecate NormalizeRXAngle and rzx_templates

qiskit/transpiler/passes/calibration/rzx_templates.py

@@ -16,10 +16,17 @@
 
 from enum import Enum
 from typing import List, Dict
+from qiskit.utils import deprecate_func
 
 from qiskit.circuit.library.templates import rzx
 
 
+@deprecate_func(
+    since="1.4",
+    removal_timeline="in Qiskit 2.0",
+    additional_msg="Use the functions in "
+    "qiskit.circuit.library.templates.rzx instead to generate rzx templates",
+)
 def rzx_templates(template_list: List[str] = None) -> Dict:
     """Convenience function to get the cost_dict and templates for template matching.
 

qiskit/transpiler/passes/optimization/normalize_rx_angle.py

@@ -20,6 +20,8 @@
 
 import numpy as np
 
+from qiskit.utils import deprecate_func
+
 from qiskit.transpiler.basepasses import TransformationPass
 from qiskit.dagcircuit import DAGCircuit
 from qiskit.circuit.library.standard_gates import RXGate, RZGate, SXGate, XGate
@@ -48,6 +50,12 @@ class NormalizeRXAngle(TransformationPass):
     Note that pulse calibration might be attached per each rotation angle.
     """
 
+    @deprecate_func(
+        since="1.4",
+        removal_timeline="in Qiskit 2.0",
+        additional_msg="This pass was used as pre-processing step of ``RXCalibrationBuilder``."
+        " With the removal of Pulse in Qiskit 2.0, this pass is no longer needed.",
+    )
     def __init__(self, target=None, resolution_in_radian=0):
         """NormalizeRXAngle initializer.
 

releasenotes/notes/deprecate-pulse-leftovers-b00c70f828d1a7fa.yaml

@@ -0,0 +1,7 @@
+deprecations_transpiler:
+  - |
+    As part of Pulse deprecation in version 1.3, the calibration builder passes
+    were also deprecated and in particular :class:`.RXCalibrationBuilder`. The
+    :class:`.NormalizeRXAngle` pass is a requirement of :class:`.RXCalibrationBuilder`
+    hence it should also be deprecated. In addition, the :func:`.rzx_templates`
+    function in the calibration module is being deprecated as it is not used.

test/python/transpiler/test_normalize_rx_angle.py

@@ -34,7 +34,8 @@ def test_not_convert_to_x_if_no_calib_in_target(self):
         """Check that RX(pi) is NOT converted to X,
         if X calibration is not present in the target"""
         empty_target = Target()
-        tp = NormalizeRXAngle(target=empty_target)
+        with self.assertWarns(DeprecationWarning):
+            tp = NormalizeRXAngle(target=empty_target)
 
         qc = QuantumCircuit(1)
         qc.rx(90, 0)
@@ -47,7 +48,8 @@ def test_sx_conversion_works(self):
         if SX calibration is present in the target"""
         target = Target()
         target.add_instruction(SXGate(), properties={(0,): None})
-        tp = NormalizeRXAngle(target=target)
+        with self.assertWarns(DeprecationWarning):
+            tp = NormalizeRXAngle(target=target)
 
         qc = QuantumCircuit(1)
         qc.rx(np.pi / 2, 0)
@@ -60,7 +62,8 @@ def test_rz_added_for_negative_rotation_angles(self):
         if RX rotation angle is negative"""
 
         backend = GenericBackendV2(num_qubits=5)
-        tp = NormalizeRXAngle(target=backend.target)
+        with self.assertWarns(DeprecationWarning):
+            tp = NormalizeRXAngle(target=backend.target)
 
         # circuit to transpile and test
         qc = QuantumCircuit(1)
@@ -83,7 +86,8 @@ def test_rz_added_for_negative_rotation_angles(self):
     def test_angle_wrapping_works(self, raw_theta, correct_wrapped_theta):
         """Check that RX rotation angles are correctly wrapped to [0, pi]"""
         backend = GenericBackendV2(num_qubits=5)
-        tp = NormalizeRXAngle(target=backend.target)
+        with self.assertWarns(DeprecationWarning):
+            tp = NormalizeRXAngle(target=backend.target)
 
         # circuit to transpile and test
         qc = QuantumCircuit(1)
@@ -118,7 +122,8 @@ def test_quantize_angles(self, resolution, rx_angles, correct_num_of_cals):
         the requested angle is not in the vicinity of the already generated angles.
         """
         backend = GenericBackendV2(num_qubits=5)
-        tp = NormalizeRXAngle(backend.target, resolution_in_radian=resolution)
+        with self.assertWarns(DeprecationWarning):
+            tp = NormalizeRXAngle(backend.target, resolution_in_radian=resolution)
 
         qc = QuantumCircuit(1)
         for rx_angle in rx_angles:

test/python/transpiler/test_template_matching.py

@@ -428,7 +428,8 @@ def test_unbound_parameters_in_rzx_template(self):
         circuit_in.p(2 * theta, 1)
         circuit_in.cx(0, 1)
 
-        pass_ = TemplateOptimization(**rzx_templates(["zz2"]))
+        with self.assertWarns(DeprecationWarning):
+            pass_ = TemplateOptimization(**rzx_templates(["zz2"]))
         circuit_out = PassManager(pass_).run(circuit_in)
 
         # these are NOT equal if template optimization works