From e26b639c4875d41cf3bc4902e29d1a6968a40c99 Mon Sep 17 00:00:00 2001 From: Ed Younis Date: Mon, 5 Aug 2024 12:02:35 -0400 Subject: [PATCH] Update pre-commit... finally... --- .pre-commit-config.yaml | 16 ++++++++-------- bqskit/ext/qiskit/models.py | 2 +- bqskit/ir/interval.py | 2 +- bqskit/ir/point.py | 2 +- bqskit/qis/state/state.py | 6 +++++- bqskit/qis/unitary/unitary.py | 7 ++++++- bqskit/qis/unitary/unitarymatrix.py | 7 ++++++- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bcdf16e4f..5fd25af39 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: skip: [mypy] repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.6.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -30,7 +30,7 @@ repos: - --wrap-summaries=80 - --wrap-descriptions=80 - repo: https://github.com/pre-commit/mirrors-autopep8 - rev: v2.0.2 + rev: v2.0.4 hooks: - id: autopep8 args: @@ -39,13 +39,13 @@ repos: - --ignore=E731 exclude: 'tests/ext.*' - repo: https://github.com/asottile/pyupgrade - rev: v3.10.1 + rev: v3.17.0 hooks: - id: pyupgrade args: - --py38-plus - repo: https://github.com/asottile/reorder_python_imports - rev: v3.10.0 + rev: v3.13.0 hooks: - id: reorder-python-imports args: @@ -54,25 +54,25 @@ repos: - --py37-plus exclude: 'tests/ext.*' - repo: https://github.com/asottile/add-trailing-comma - rev: v3.0.1 + rev: v3.1.0 hooks: - id: add-trailing-comma args: - --py36-plus - repo: https://github.com/PyCQA/autoflake - rev: v2.2.0 + rev: v2.3.1 hooks: - id: autoflake args: - --in-place - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.5.0 + rev: v1.11.1 hooks: - id: mypy exclude: tests/qis/test_pauli.py additional_dependencies: ["numpy>=1.21"] - repo: https://github.com/PyCQA/flake8 - rev: 6.1.0 + rev: 7.1.1 hooks: - id: flake8 args: diff --git a/bqskit/ext/qiskit/models.py b/bqskit/ext/qiskit/models.py index 237771390..9b42d57f3 100644 --- a/bqskit/ext/qiskit/models.py +++ b/bqskit/ext/qiskit/models.py @@ -23,7 +23,7 @@ def model_from_backend(backend: BackendV1) -> MachineModel: num_qudits = config.n_qubits gate_set = _basis_gate_str_to_bqskit_gate(config.basis_gates) coupling_map = list({tuple(sorted(e)) for e in config.coupling_map}) - return MachineModel(num_qudits, coupling_map, gate_set) # type: ignore + return MachineModel(num_qudits, coupling_map, gate_set) def _basis_gate_str_to_bqskit_gate(basis_gates: list[str]) -> set[Gate]: diff --git a/bqskit/ir/interval.py b/bqskit/ir/interval.py index 5375955a6..97f8a6552 100644 --- a/bqskit/ir/interval.py +++ b/bqskit/ir/interval.py @@ -89,7 +89,7 @@ def __new__( 'Expected positive integers, got {lower} and {upper}.', ) - return super().__new__(cls, (lower, upper)) # type: ignore + return super().__new__(cls, (lower, upper)) @property def lower(self) -> int: diff --git a/bqskit/ir/point.py b/bqskit/ir/point.py index a44d1b1f5..0e510c449 100644 --- a/bqskit/ir/point.py +++ b/bqskit/ir/point.py @@ -66,7 +66,7 @@ def __new__( else: raise TypeError('Expected two integer arguments.') - return super().__new__(cls, (cycle, qudit)) # type: ignore + return super().__new__(cls, (cycle, qudit)) @property def cycle(self) -> int: diff --git a/bqskit/qis/state/state.py b/bqskit/qis/state/state.py index bd8f93e88..d29d61521 100644 --- a/bqskit/qis/state/state.py +++ b/bqskit/qis/state/state.py @@ -433,4 +433,8 @@ def __repr__(self) -> str: return repr(self._vec) -StateLike = Union[StateVector, np.ndarray, Sequence[Union[int, float, complex]]] +StateLike = Union[ + StateVector, + npt.NDArray[np.complex128], + Sequence[Union[int, float, complex]], +] diff --git a/bqskit/qis/unitary/unitary.py b/bqskit/qis/unitary/unitary.py index cb4ada60f..fb797ecce 100644 --- a/bqskit/qis/unitary/unitary.py +++ b/bqskit/qis/unitary/unitary.py @@ -7,6 +7,7 @@ from typing import Union import numpy as np +import numpy.typing as npt from bqskit.qis.unitary.meta import UnitaryMeta from bqskit.utils.typing import is_real_number @@ -151,4 +152,8 @@ def is_self_inverse(self, params: RealVector = []) -> bool: return np.allclose(unitary_matrix, hermitian_conjugate) -RealVector = Union[Sequence[float], np.ndarray] +RealVector = Union[ + Sequence[float], + npt.NDArray[np.float64], + npt.NDArray[np.float32], +] diff --git a/bqskit/qis/unitary/unitarymatrix.py b/bqskit/qis/unitary/unitarymatrix.py index 5448d9215..04fafc616 100644 --- a/bqskit/qis/unitary/unitarymatrix.py +++ b/bqskit/qis/unitary/unitarymatrix.py @@ -540,6 +540,11 @@ def __hash__(self) -> int: UnitaryLike = Union[ UnitaryMatrix, - np.ndarray, + npt.NDArray[np.complex128], + npt.NDArray[np.complex64], + npt.NDArray[np.int64], + npt.NDArray[np.int32], + npt.NDArray[np.float64], + npt.NDArray[np.float32], Sequence[Sequence[Union[int, float, complex]]], ]