diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3d159103..737ab0c1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-docstring-first - id: check-yaml @@ -15,7 +15,7 @@ repos: - id: trailing-whitespace - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.17.0 + rev: v3.19.0 hooks: - id: pyupgrade args: [--py39-plus] @@ -25,7 +25,7 @@ repos: - id: isort args: ["--profile", "black"] - repo: https://github.com/psf/black - rev: 24.8.0 + rev: 24.10.0 hooks: - id: black args: ["--line-length", "120"] diff --git a/src/tests/instrument_test.py b/src/tests/instrument_test.py index 9280960c..cca5c6b0 100644 --- a/src/tests/instrument_test.py +++ b/src/tests/instrument_test.py @@ -21,8 +21,8 @@ # pylint: disable=missing-function-docstring import pytest from qcodes.instrument import Instrument, VisaInstrument +from qcodes.instrument_drivers.mock_instruments import DummyInstrument from qcodes.parameters import Parameter -from qcodes.tests.instrument_mocks import DummyInstrument from qumada.instrument.instrument import is_instrument_class diff --git a/src/tests/mapping_test.py b/src/tests/mapping_test.py index 42c23182..b78faac3 100644 --- a/src/tests/mapping_test.py +++ b/src/tests/mapping_test.py @@ -33,8 +33,11 @@ from PyQt5.QtWidgets import QApplication, QMessageBox from pytest_cases import fixture_ref, parametrize from pytest_mock import MockerFixture +from qcodes.instrument_drivers.mock_instruments import ( + DummyChannelInstrument, + DummyInstrument, +) from qcodes.station import Station -from qcodes.tests.instrument_mocks import DummyChannelInstrument, DummyInstrument import qumada.instrument.mapping as mapping from qumada.instrument.custom_drivers.Dummies.dummy_dac import DummyDac