Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.15.14
rev: v0.15.15
hooks:
- id: ruff-check
types_or: [python, pyi, jupyter, toml]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"\n",
"if TYPE_CHECKING:\n",
" from qcodes.dataset.data_set_protocol import ValuesType\n",
" from qcodes.parameters import ParameterBase, ParamRawDataType"
" from qcodes.parameters import ParamRawDataType"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/qcodes/instrument/channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from .instrument_base import InstrumentBase

if TYPE_CHECKING:
from typing import Self, Unpack
from typing import Unpack

from .instrument_base import InstrumentBaseKWArgs

Expand Down
1 change: 0 additions & 1 deletion src/qcodes/instrument/instrument_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import collections.abc
import logging
import warnings
from collections.abc import Callable, Mapping, Sequence
from typing import TYPE_CHECKING, Any, ClassVar, cast

import numpy as np
Expand Down
1 change: 0 additions & 1 deletion src/qcodes/instrument_drivers/agilent/Agilent_34401A.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from typing import TYPE_CHECKING

from qcodes.instrument import VisaInstrumentKWArgs
from qcodes.validators import Strings

from ._Agilent_344xxA import Agilent344xxA
Expand Down
1 change: 0 additions & 1 deletion src/qcodes/instrument_drivers/agilent/Agilent_34410A.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from typing import TYPE_CHECKING

from qcodes.instrument import VisaInstrumentKWArgs
from qcodes.validators import Strings

from ._Agilent_344xxA import Agilent344xxA
Expand Down
1 change: 0 additions & 1 deletion src/qcodes/instrument_drivers/agilent/Agilent_34411A.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from typing import TYPE_CHECKING

from qcodes.instrument import VisaInstrumentKWArgs
from qcodes.validators import Strings

from ._Agilent_344xxA import Agilent344xxA
Expand Down
2 changes: 1 addition & 1 deletion src/qcodes/parameters/parameter_with_setpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from typing import Unpack

from qcodes.dataset.data_set_protocol import ValuesType
from qcodes.parameters.parameter_base import ParamDataType, ParameterBase
from qcodes.parameters.parameter_base import ParamDataType

LOG = logging.getLogger(__name__)

Expand Down
1 change: 0 additions & 1 deletion src/qcodes/utils/delaykeyboardinterrupt.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import logging
import signal
import threading
from collections.abc import Callable
from typing import TYPE_CHECKING, Any, cast

if TYPE_CHECKING:
Expand Down
1 change: 0 additions & 1 deletion tests/dataset/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import os
import shutil
import tempfile
from collections.abc import Generator
from contextlib import contextmanager
from enum import StrEnum
from typing import TYPE_CHECKING
Expand Down
2 changes: 0 additions & 2 deletions tests/dataset/measurement/test_inferred_parameters_fix.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

from qcodes.dataset import Measurement
from qcodes.dataset.descriptions.detect_shapes import detect_shape_of_measurement
from qcodes.dataset.experiment_container import Experiment
from qcodes.instrument_drivers.mock_instruments import DummyInstrument
from qcodes.parameters import DelegateParameter, ManualParameter, Parameter

if TYPE_CHECKING:
Expand Down
2 changes: 0 additions & 2 deletions tests/dataset/test_dataset_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,9 @@
load_from_netcdf,
new_data_set,
)
from qcodes.dataset.data_set import DataSet
from qcodes.dataset.data_set_in_memory import DataSetInMem
from qcodes.dataset.descriptions.dependencies import InterDependencies_
from qcodes.dataset.descriptions.versioning import serialization as serial
from qcodes.dataset.experiment_container import Experiment
from qcodes.dataset.export_config import DataExportType
from qcodes.dataset.exporters.export_to_pandas import _generate_pandas_index
from qcodes.dataset.exporters.export_to_xarray import _calculate_index_shape
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
from qcodes.instrument_drivers.Keysight.keysightb1500.KeysightB1500_module import (
MeasurementNotTaken,
)
from qcodes.instrument_drivers.Keysight.keysightb1500.KeysightB1511B import (
KeysightB1511B,
)

if TYPE_CHECKING:
from qcodes.instrument_drivers.Keysight.keysightb1500.KeysightB1500_base import (
Expand Down
Loading