Skip to content

Commit

Permalink
Merge branch 'main' into qiskit-1.0-bump
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxleDrut authored Jul 16, 2024
2 parents f1a3929 + 8248a0a commit 75ed808
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion tests/test_circuits/basic_gates.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ def test_fixture():
else:
circuit.delay(0.5, 0, unit=unit)
return _map_gate_name("delay"), unit, circuit

return test_fixture


Expand Down
1 change: 0 additions & 1 deletion tests/test_qiskit_qir.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ def test_two_delay_gates_single_declaration():
assert func[1] == test_utils.rotation_call_string("delay", 1, 0)
assert func[2] == test_utils.rotation_call_string("delay", 2, 0)


@pytest.mark.parametrize("circuit_name", double_op_tests)
def test_double_qubit_gates(circuit_name, request):
qir_op, circuit = request.getfixturevalue(circuit_name)
Expand Down

0 comments on commit 75ed808

Please sign in to comment.