Linter fixes

Author: mkvanhooft

netqasm/lang/instr/flavour.py

@@ -2,7 +2,7 @@
 from dataclasses import dataclass
 from typing import Dict, List, Optional, Type
 
-from . import NetQASMInstruction, core, nv, trapped_ion, vanilla, trapped_ion_individual
+from . import NetQASMInstruction, core, nv, trapped_ion, trapped_ion_individual, vanilla
 
 
 @dataclass
@@ -154,4 +154,4 @@ def instrs(self):
         ]
 
     def __init__(self):
-        super().__init__(self.instrs)
+        super().__init__(self.instrs)

netqasm/lang/instr/trapped_ion_individual.py

@@ -3,11 +3,10 @@
 
 import numpy as np
 
-from netqasm.lang.operand import Immediate, Operand, Register, Template
+from netqasm.lang.operand import Operand
 from netqasm.util.quantum_gates import get_rotation_matrix
 
-from . import base, core
-
+from . import core
 
 
 @dataclass
@@ -59,4 +58,4 @@ def to_matrix(self):
     def to_matrix_target_only(self):
         # NOTE: The MS instruction acts on both qubits
         # Therefore, it is OK to not explicitly define a matrix.
-        return None  # type: ignore
+        return None  # type: ignore

netqasm/sdk/transpile.py

@@ -8,7 +8,14 @@
 import abc
 from typing import Dict, List, Optional, Set, Tuple, Union
 
-from netqasm.lang.instr import DebugInstruction, NetQASMInstruction, core, nv, vanilla, trapped_ion_individual
+from netqasm.lang.instr import (
+    DebugInstruction,
+    NetQASMInstruction,
+    core,
+    nv,
+    trapped_ion_individual,
+    vanilla,
+)
 from netqasm.lang.instr.flavour import REIDSFlavour
 from netqasm.lang.operand import Immediate, Register, RegisterName
 from netqasm.lang.subroutine import Subroutine
@@ -805,26 +812,25 @@ def _transpile_two_qubit_gate(self, instr: core.TwoQubitInstruction):
         # TODO Different implementation per CNOT or CPHASE or MOV
         if isinstance(instr, vanilla.CnotInstruction):
             return [
-            trapped_ion_individual.RotXInstruction(
-                lineno=instr.lineno,
-                reg=instr.reg0,
-                imm0=Immediate(24),
-                imm1=Immediate(4)),
-
-            trapped_ion_individual.MSGateInstruction(
-                lineno=instr.lineno,
-                reg0=instr.reg0,
-                reg1=instr.reg1,
-            )]  # TODO This is just a draft, not acually the proper CNOT transpile
+                trapped_ion_individual.RotXInstruction(
+                    lineno=instr.lineno,
+                    reg=instr.reg0,
+                    imm0=Immediate(24),
+                    imm1=Immediate(4),
+                ),
+                trapped_ion_individual.MSGateInstruction(
+                    lineno=instr.lineno,
+                    reg0=instr.reg0,
+                    reg1=instr.reg1,
+                ),
+            ]  # TODO This is just a draft, not acually the proper CNOT transpile
         elif isinstance(instr, vanilla.CphaseInstruction):
             return []  # TODO add instructions
         elif isinstance(instr, vanilla.MovInstruction):
             return []  # TODO add instructions
         else:
             raise KeyError("")
 
-
-
     def _handle_single_qubit_gate(
         self,
         instr: Union[core.SingleQubitInstruction, core.RotationInstruction],
@@ -979,4 +985,4 @@ def _map_single_gate(
         else:
             raise ValueError(
                 f"Don't know how to map instruction {instr} of type {type(instr)}"
-            )
+            )