Skip to content

Commit

Permalink
Merge pull request #271 from jenshnielsen/qcodes_0_42
Browse files Browse the repository at this point in the history
update imports for qcodes >0.42
  • Loading branch information
jenshnielsen authored Nov 16, 2023
2 parents 8f0eba2 + 4faa6d7 commit d840b5c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ classifiers = [
"Programming Language :: Python :: 3.11",
"Topic :: Scientific/Engineering",]
requires-python = ">=3.9"
dependencies = [ "qcodes>=0.37.0", "versioningit>=2.0.1", "packaging"]
dependencies = [ "qcodes>=0.42.0", "versioningit>=2.0.1", "packaging"]
dynamic = [ "version",]

[[project.maintainers]]
Expand Down
6 changes: 3 additions & 3 deletions qcodes_contrib_drivers/tests/test_Keysight_M3201A.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
try:
from qcodes.tests.driver_test_case import DriverTestCase
from qcodes.extensions import DriverTestCase
except ImportError:
# qcodes < 0.37
from qcodes.instrument_drivers.test import DriverTestCase # type: ignore[import-not-found,no-redef]
# qcodes < 0.42.0
from qcodes.tests.driver_test_case import DriverTestCase
import unittest

try:
Expand Down

0 comments on commit d840b5c

Please sign in to comment.