Get rid of some deprecation warnings (#379)

Author: cqc-alec

pytket/extensions/qiskit/backends/aer.py

@@ -51,7 +51,7 @@
     FullPeepholeOptimise,
     SequencePass,
     SynthesiseTket,
-    auto_rebase_pass,
+    AutoRebase,
     NaivePlacementPass,
 )
 from pytket.pauli import Pauli, QubitPauliString
@@ -161,7 +161,7 @@ def backend_info(self) -> BackendInfo:
         return self._backend_info
 
     def rebase_pass(self) -> BasePass:
-        return auto_rebase_pass(
+        return AutoRebase(
             self._backend_info.gate_set,
         )
 

pytket/extensions/qiskit/backends/ibm.py

@@ -57,7 +57,7 @@
 from pytket.backends.resulthandle import _ResultIdTuple
 from pytket.passes import (
     BasePass,
-    auto_rebase_pass,
+    AutoRebase,
     KAKDecomposition,
     RemoveRedundancies,
     SequencePass,
@@ -193,7 +193,7 @@ def __init__(
             if service is None
             else service
         )
-        self._backend: "BackendV1" = self._service.get_backend(backend_name)
+        self._backend: "BackendV1" = self._service.backend(backend_name)
         config: QasmBackendConfiguration = self._backend.configuration()
         self._max_per_job = getattr(config, "max_experiments", 1)
 
@@ -204,7 +204,7 @@ def __init__(
         self._service = QiskitRuntimeService(
             channel="ibm_quantum", token=token, instance=instance
         )
-        self._session = Session(service=self._service, backend=backend_name)
+        self._session = Session(backend=self._backend)
 
         self._primitive_gates = _get_primitive_gates(gate_set)
 
@@ -476,7 +476,7 @@ def rebase_pass(self) -> BasePass:
 
     @staticmethod
     def rebase_pass_offline(primitive_gates: set[OpType]) -> BasePass:
-        return auto_rebase_pass(primitive_gates)
+        return AutoRebase(primitive_gates)
 
     def process_circuits(
         self,
@@ -556,7 +556,7 @@ def process_circuits(
                             ppcirc_strs[i],
                         )
                 else:
-                    sampler = SamplerV2(session=self._session, options=sampler_options)
+                    sampler = SamplerV2(mode=self._session, options=sampler_options)
                     job = sampler.run(qcs, shots=n_shots)
                     job_id = job.job_id()
                     for i, ind in enumerate(indices_chunk):

pytket/extensions/qiskit/qiskit_convert.py

@@ -341,7 +341,8 @@ def add_qiskit_data(
         self, circuit: QuantumCircuit, data: Optional["QuantumCircuitData"] = None
     ) -> None:
         data = data or circuit.data
-        for instr, qargs, cargs in data:
+        for datum in data:
+            instr, qargs, cargs = datum.operation, datum.qubits, datum.clbits
             condition_kwargs = {}
             if instr.condition is not None:
                 if type(instr.condition[0]) == ClassicalRegister:

tests/qiskit_convert_test.py

@@ -33,7 +33,7 @@
 from qiskit_aer import Aer  # type: ignore
 from qiskit.transpiler.passes import BasisTranslator  # type: ignore
 from qiskit.circuit.equivalence_library import StandardEquivalenceLibrary  # type: ignore
-from qiskit_ibm_runtime.fake_provider import FakeGuadalupe  # type: ignore
+from qiskit_ibm_runtime.fake_provider import FakeGuadalupeV2  # type: ignore
 from qiskit.circuit.parameterexpression import ParameterExpression  # type: ignore
 from qiskit.circuit.library import TwoLocal
 from qiskit import transpile
@@ -88,7 +88,7 @@ def _get_qiskit_statevector(qc: QuantumCircuit) -> np.ndarray:
 def test_parameterised_circuit_global_phase() -> None:
     pass_1 = BasisTranslator(
         StandardEquivalenceLibrary,
-        target_basis=FakeGuadalupe().configuration().basis_gates,
+        target_basis=FakeGuadalupeV2().configuration().basis_gates,
     )
     pass_2 = CliffordSimp()