Temporarily remove Operation class usage for 0.20

qiskit/circuit/__init__.py

@@ -234,7 +234,6 @@
 from .controlledgate import ControlledGate
 from .instruction import Instruction
 from .instructionset import InstructionSet
-from .operation import Operation
 from .barrier import Barrier
 from .delay import Delay
 from .measure import Measure

qiskit/circuit/barrier.py

@@ -14,10 +14,9 @@
 
 from qiskit.exceptions import QiskitError
 from .instruction import Instruction
-from .operation import Operation
 
 
-class Barrier(Instruction, Operation):
+class Barrier(Instruction):
     """Barrier instruction."""
 
     _directive = True

qiskit/circuit/gate.py

@@ -18,10 +18,9 @@
 from qiskit.circuit.parameterexpression import ParameterExpression
 from qiskit.circuit.exceptions import CircuitError
 from .instruction import Instruction
-from .operation import Operation
 
 
-class Gate(Instruction, Operation):
+class Gate(Instruction):
     """Unitary gate."""
 
     def __init__(

qiskit/circuit/measure.py

@@ -17,11 +17,10 @@
 import warnings
 
 from qiskit.circuit.instruction import Instruction
-from qiskit.circuit.operation import Operation
 from qiskit.circuit.exceptions import CircuitError
 
 
-class Measure(Instruction, Operation):
+class Measure(Instruction):
     """Quantum measurement in the computational basis."""
 
     def __init__(self):

qiskit/circuit/reset.py

@@ -17,10 +17,9 @@
 import warnings
 
 from qiskit.circuit.instruction import Instruction
-from qiskit.circuit.operation import Operation
 
 
-class Reset(Instruction, Operation):
+class Reset(Instruction):
     """Qubit reset."""
 
     def __init__(self):

qiskit/extensions/quantum_initializer/initializer.py

@@ -17,13 +17,13 @@
 
 from qiskit.circuit import QuantumCircuit
 from qiskit.circuit import QuantumRegister
-from qiskit.circuit import Instruction, Operation
+from qiskit.circuit import Instruction
 from qiskit.circuit.library.data_preparation import StatePreparation
 
 _EPS = 1e-10  # global variable used to chop very small numbers to zero
 
 
-class Initialize(Instruction, Operation):
+class Initialize(Instruction):
     """Complex amplitude initialization.
 
     Class that initializes some flexible collection of qubit registers, implemented by calling

qiskit/extensions/quantum_initializer/isometry.py

@@ -25,7 +25,6 @@
 
 from qiskit.circuit.exceptions import CircuitError
 from qiskit.circuit.instruction import Instruction
-from qiskit.circuit.operation import Operation
 from qiskit.circuit.quantumcircuit import QuantumCircuit
 from qiskit.circuit.quantumregister import QuantumRegister
 from qiskit.exceptions import QiskitError
@@ -36,7 +35,7 @@
 _EPS = 1e-10  # global variable used to chop very small numbers to zero
 
 
-class Isometry(Instruction, Operation):
+class Isometry(Instruction):
     """
     Decomposition of arbitrary isometries from m to n qubits. In particular, this allows to
     decompose unitaries (m=n) and to do state preparation (m=0).

qiskit/quantum_info/operators/dihedral/dihedral.py

@@ -23,12 +23,12 @@
 from qiskit.quantum_info.operators.scalar_op import ScalarOp
 from qiskit.quantum_info.synthesis.cnotdihedral_decompose import decompose_cnotdihedral
 from qiskit.quantum_info.operators.mixins import generate_apidocs, AdjointMixin
-from qiskit.circuit import QuantumCircuit, Instruction, Operation
+from qiskit.circuit import QuantumCircuit, Instruction
 from .dihedral_circuits import _append_circuit
 from .polynomial import SpecialPolynomial
 
 
-class CNOTDihedral(BaseOperator, AdjointMixin, Operation):
+class CNOTDihedral(BaseOperator, AdjointMixin):
     """An N-qubit operator from the CNOT-Dihedral group.
 
      The CNOT-Dihedral group is generated by the quantum gates,

qiskit/quantum_info/operators/symplectic/clifford.py

@@ -16,7 +16,7 @@
 import numpy as np
 
 from qiskit.exceptions import QiskitError
-from qiskit.circuit import QuantumCircuit, Instruction, Operation
+from qiskit.circuit import QuantumCircuit, Instruction
 from qiskit.circuit.library.standard_gates import IGate, XGate, YGate, ZGate, HGate, SGate
 from qiskit.quantum_info.operators.base_operator import BaseOperator
 from qiskit.quantum_info.operators.operator import Operator
@@ -27,7 +27,7 @@
 from .clifford_circuits import _append_circuit
 
 
-class Clifford(BaseOperator, AdjointMixin, Operation):
+class Clifford(BaseOperator, AdjointMixin):
     """An N-qubit unitary operator from the Clifford group.
 
     **Representation**

qiskit/quantum_info/operators/symplectic/pauli.py

@@ -20,7 +20,7 @@
 
 import numpy as np
 
-from qiskit.circuit import Instruction, QuantumCircuit, Operation
+from qiskit.circuit import Instruction, QuantumCircuit
 from qiskit.circuit.barrier import Barrier
 from qiskit.circuit.library.generalized_gates import PauliGate
 from qiskit.circuit.library.standard_gates import IGate, XGate, YGate, ZGate
@@ -31,7 +31,7 @@
 from qiskit.utils.deprecation import deprecate_function
 
 
-class Pauli(BasePauli, Operation):
+class Pauli(BasePauli):
     r"""N-qubit Pauli operator.
 
     This class represents an operator :math:`P` from the full :math:`n`-qubit