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 pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ authors = [
dependencies = [
"pyqt5",
"pyzmq",
"qcodes",
"qcodes>=0.58.0",
"qtpy",
"scipy",
"numpy",
Expand Down
3 changes: 1 addition & 2 deletions src/instrumentserver/params.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
from pathlib import Path
from typing import Any, Dict, List, Union

from qcodes import Parameter
from qcodes import Parameter, validators
from qcodes.instrument import InstrumentBase
from qcodes.parameters import ParameterBase
from qcodes.utils import validators

from . import serialize

Expand Down
3 changes: 1 addition & 2 deletions src/instrumentserver/testing/dummy_instruments/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
from typing import List

import numpy as np
from qcodes import Instrument
from qcodes import Instrument, validators
from qcodes.math_utils.field_vector import FieldVector
from qcodes.utils import validators


class DummyChannel(Instrument):
Expand Down
8 changes: 6 additions & 2 deletions src/instrumentserver/testing/dummy_instruments/rf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@

import numpy as np
from numpy.typing import NDArray
from qcodes import Instrument, ParameterWithSetpoints, find_or_create_instrument
from qcodes.utils import validators
from qcodes import (
Instrument,
ParameterWithSetpoints,
find_or_create_instrument,
validators,
)
from scipy import constants


Expand Down
Loading
Loading