style: add refurb and apply its changes, upgrade wasmtime (#105)

.pre-commit-config.yaml

@@ -31,6 +31,11 @@ repos:
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
 
+  - repo: https://github.com/dosisod/refurb
+    rev: v1.28.0
+    hooks:
+      - id: refurb
+
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: 'v1.8.0'
     hooks:

pyproject.toml

@@ -63,3 +63,6 @@ log_date_format = "%Y-%m-%d %H:%M:%S"
 
 [tool.setuptools_scm]
 version_scheme = "python-simplified-semver"
+
+[tool.refurb]
+python_version = "3.10"

pytket/phir/api.py

@@ -64,8 +64,7 @@ def pytket_to_phir(
         machine = None
 
     logger.debug("Sharding input circuit...")
-    sharder = Sharder(circuit)
-    shards = sharder.shard()
+    shards = Sharder(circuit).shard()
 
     if machine:
         # Only print message if a machine object is passed

pytket/phir/cli.py

@@ -57,7 +57,7 @@ def main() -> None:
     parser.add_argument(
         "--version",
         action="version",
-        version=f'{version("pytket-phir")}',
+        version=str(version("pytket-phir")),
     )
     args = parser.parse_args()
 

pytket/phir/phirgen.py

@@ -352,8 +352,8 @@ def make_comment_text(command: tk.Command, op: tk.Op) -> str:
         case tk.WASMOp():
             args, returns = extract_wasm_args_and_returns(command, op)
             return f"WASM function={op.func_name} args={args} returns={returns}"
-        case _:
-            return str(command)
+
+    return str(command)
 
 
 def get_decls(qbits: set["Qubit"], cbits: set[tkBit]) -> list[dict[str, str | int]]:

requirements.txt

@@ -10,5 +10,5 @@ pytket==1.24.0
 ruff==0.1.14
 setuptools_scm==8.0.4
 sphinx==7.2.6
-wasmtime==15.0.0
+wasmtime==16.0.0
 wheel==0.42.0

tests/test_sharder.py

@@ -17,8 +17,7 @@
 class TestSharder:
     def test_shard_hashing(self) -> None:
         circuit = get_qasm_as_circuit(QasmFile.baby)
-        sharder = Sharder(circuit)
-        shards = sharder.shard()
+        shards = Sharder(circuit).shard()
 
         shard_set = set(shards)
         assert len(shard_set) == 3
@@ -47,8 +46,7 @@ def test_should_op_create_shard(self) -> None:
 
     def test_with_baby_circuit(self) -> None:
         circuit = get_qasm_as_circuit(QasmFile.baby)
-        sharder = Sharder(circuit)
-        shards = sharder.shard()
+        shards = Sharder(circuit).shard()
 
         assert len(shards) == 3
 
@@ -70,8 +68,7 @@ def test_with_baby_circuit(self) -> None:
 
     def test_rollup_behavior(self) -> None:
         circuit = get_qasm_as_circuit(QasmFile.baby_with_rollup)
-        sharder = Sharder(circuit)
-        shards = sharder.shard()
+        shards = Sharder(circuit).shard()
 
         assert len(shards) == 5
 
@@ -106,8 +103,7 @@ def test_rollup_behavior(self) -> None:
 
     def test_simple_conditional(self) -> None:
         circuit = get_qasm_as_circuit(QasmFile.simple_cond)
-        sharder = Sharder(circuit)
-        shards = sharder.shard()
+        shards = Sharder(circuit).shard()
 
         assert len(shards) == 4
 
@@ -153,8 +149,7 @@ def test_simple_conditional(self) -> None:
 
     def test_complex_barriers(self) -> None:  # noqa: PLR0915
         circuit = get_qasm_as_circuit(QasmFile.barrier_complex)
-        sharder = Sharder(circuit)
-        shards = sharder.shard()
+        shards = Sharder(circuit).shard()
 
         assert len(shards) == 7
 
@@ -238,8 +233,7 @@ def test_complex_barriers(self) -> None:  # noqa: PLR0915
 
     def test_classical_hazards(self) -> None:
         circuit = get_qasm_as_circuit(QasmFile.classical_hazards)
-        sharder = Sharder(circuit)
-        shards = sharder.shard()
+        shards = Sharder(circuit).shard()
 
         assert len(shards) == 5
 
@@ -286,8 +280,7 @@ def test_classical_hazards(self) -> None:
 
     def test_with_big_gate(self) -> None:
         circuit = get_qasm_as_circuit(QasmFile.big_gate)
-        sharder = Sharder(circuit)
-        shards = sharder.shard()
+        shards = Sharder(circuit).shard()
 
         assert len(shards) == 2
 
@@ -310,8 +303,7 @@ def test_with_big_gate(self) -> None:
 
     def test_classical_ordering_breaking_circuit(self) -> None:
         circuit = get_qasm_as_circuit(QasmFile.classical_ordering)
-        sharder = Sharder(circuit)
-        shards = sharder.shard()
+        shards = Sharder(circuit).shard()
 
         assert len(shards) == 4
 

tests/test_utils.py

@@ -73,8 +73,7 @@ def get_phir_json(qasmfile: QasmFile, *, rebase: bool) -> "JsonDict":
         circuit = rebase_to_qtm_machine(circuit, qtm_machine.value, 0)
     machine = QTM_MACHINES_MAP.get(qtm_machine)
     assert machine
-    sharder = Sharder(circuit)
-    shards = sharder.shard()
+    shards = Sharder(circuit).shard()
     placed = place_and_route(shards, machine)
     return json.loads(genphir_parallel(placed, machine))  # type: ignore[misc, no-any-return]