diff --git a/docs/changelog.rst b/docs/changelog.rst index 042b6174..d8b64699 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,11 @@ Changelog ~~~~~~~~~ +0.55.0 (unreleased) +------------------- + +* Updated pytket version requirement to 1.30.0rc0. + 0.54.1 (June 2024) ------------------ diff --git a/mypy.ini b/mypy.ini index 3daa6c71..9001fea4 100644 --- a/mypy.ini +++ b/mypy.ini @@ -26,3 +26,6 @@ ignore_errors = True [mypy-lark.*] ignore_missing_imports = True ignore_errors = True + +[mypy-sympy.*] +ignore_missing_imports = True diff --git a/pytket/extensions/qiskit/qiskit_convert.py b/pytket/extensions/qiskit/qiskit_convert.py index b6144d73..f9b87b63 100644 --- a/pytket/extensions/qiskit/qiskit_convert.py +++ b/pytket/extensions/qiskit/qiskit_convert.py @@ -564,11 +564,11 @@ def param_to_tk(p: Union[float, ParameterExpression]) -> sympy.Expr: if isinstance(p, ParameterExpression): symexpr = p._symbol_expr try: - return symexpr._sympy_() / sympy.pi # type: ignore + return symexpr._sympy_() / sympy.pi except AttributeError: - return symexpr / sympy.pi # type: ignore + return symexpr / sympy.pi else: - return p / sympy.pi # type: ignore + return p / sympy.pi def param_to_qiskit( @@ -584,7 +584,7 @@ def param_to_qiskit( def _get_params( op: Op, symb_map: Dict[Parameter, sympy.Symbol] ) -> List[Union[float, ParameterExpression]]: - return [param_to_qiskit(p, symb_map) for p in op.params] # type: ignore + return [param_to_qiskit(p, symb_map) for p in op.params] def append_tk_command_to_qiskit( @@ -706,7 +706,7 @@ def append_tk_command_to_qiskit( if optype == OpType.CnRy: # might as well do a bit more checking assert len(op.params) == 1 - alpha = param_to_qiskit(op.params[0], symb_map) # type: ignore + alpha = param_to_qiskit(op.params[0], symb_map) assert len(qargs) >= 2 if len(qargs) == 2: # presumably more efficient; single control only @@ -834,7 +834,7 @@ def tk_to_qiskit( append_tk_command_to_qiskit( command.op, command.args, qcirc, qregmap, cregmap, symb_map, range_preds ) - qcirc.global_phase += param_to_qiskit(tkc.phase, symb_map) # type: ignore + qcirc.global_phase += param_to_qiskit(tkc.phase, symb_map) # if UUID stored in name, set parameter uuids accordingly (see qiskit_to_tk) updates = dict() diff --git a/setup.py b/setup.py index bbad33f3..2c3cb528 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ packages=find_namespace_packages(include=["pytket.*"]), include_package_data=True, install_requires=[ - "pytket >= 1.29", + "pytket >= 1.30.0rc0", "qiskit >= 1.1", "qiskit-algorithms >= 0.3.0", "qiskit-ibm-runtime >= 0.24.1", diff --git a/tests/qiskit_convert_test.py b/tests/qiskit_convert_test.py index 3b3bb9da..5d21ecc3 100644 --- a/tests/qiskit_convert_test.py +++ b/tests/qiskit_convert_test.py @@ -202,11 +202,11 @@ def test_convert() -> None: def test_symbolic() -> None: - pi2 = Symbol("pi2") # type: ignore - pi3 = Symbol("pi3") # type: ignore - pi0 = Symbol("pi0") # type: ignore + pi2 = Symbol("pi2") + pi3 = Symbol("pi3") + pi0 = Symbol("pi0") tkc = Circuit(3, 3, name="test").Ry(pi2, 1).Rx(pi3, 1).CX(1, 0) - tkc.add_phase(Symbol("pi0") * 2) # type: ignore + tkc.add_phase(Symbol("pi0") * 2) RebaseTket().apply(tkc) qc = tk_to_qiskit(tkc) @@ -502,7 +502,7 @@ def test_gate_str_2_optype() -> None: def test_customgate() -> None: - a = Symbol("a") # type: ignore + a = Symbol("a") def_circ = Circuit(2) def_circ.CZ(0, 1) def_circ.Rx(a, 1)