QCoDeS · jenshnielsen · Jan 30, 2023 · Jan 30, 2023 · Jan 30, 2023 · Jan 30, 2023
diff --git a/docs/examples/Andor_DU401.ipynb b/docs/examples/Andor_DU401.ipynb
diff --git a/docs/examples/Attocube_ANC300.ipynb b/docs/examples/Attocube_ANC300.ipynb
@@ -14,7 +14,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from qcodes.instrument_drivers.attocube.ANC300 import ANC300"
+    "from qcodes_contrib_drivers.drivers.Attocube.ANC300 import ANC300"
    ]
   },
   {

diff --git a/docs/examples/Aviosys_IP_Power_9258S.ipynb b/docs/examples/Aviosys_IP_Power_9258S.ipynb
@@ -18,7 +18,7 @@
    },
    "outputs": [],
    "source": [
-    "from qcodes.instrument_drivers.Aviosys.IP_Power_9258S import Aviosys_IP_Power_9258S"
+    "from qcodes_contrib_drivers.drivers.Aviosys.IP_Power_9258S import Aviosys_IP_Power_9258S"
    ]
   },
   {

diff --git a/docs/examples/Lakeshore_311.ipynb b/docs/examples/Lakeshore_311.ipynb
@@ -18,7 +18,7 @@
    },
    "outputs": [],
    "source": [
-    "from qcodes.instrument_drivers.Lakeshore.Model_331 import Model_331"
+    "from qcodes_contrib_drivers.drivers.Lakeshore.Model_331 import Model_331"
    ]
   },
   {

diff --git a/docs/examples/QDevil/QDAC1/QCodes example with QDevil_QDAC.ipynb b/docs/examples/QDevil/QDAC1/QCodes example with QDevil_QDAC.ipynb
@@ -17,9 +17,9 @@
     "\n",
     "import numpy as np\n",
     "\n",
-    "import qcodes as qc\n",
-    "import qcodes.instrument_drivers.QDevil.QDevil_QDAC as QDac\n",
-    "from qcodes.instrument_drivers.QDevil.QDevil_QDAC import Mode"
+    "from qcodes.dataset import new_experiment\n",
+    "from qcodes.station import Station\n",
+    "from qcodes_contrib_drivers.drivers.QDevil.QDAC1 import QDac, Mode"
    ]
   },
   {
@@ -45,7 +45,7 @@
     "# as this takes some 0.2-0.5 secs per channel due to the sensor settling time. \n",
     "# You can force reading the current sensors at startup by specifiying \"update_currents=True\" in the call.\n",
     "\n",
-    "qdac = QDac.QDac(name='qdac', address='ASRL2::INSTR', update_currents=False)\n",
+    "qdac = QDac(name='qdac', address='ASRL2::INSTR', update_currents=False)\n",
     "print(\"Number of channels: \",qdac.num_chans)"
    ]
   },
@@ -297,8 +297,8 @@
     "\n",
     "from qcodes.dataset import Measurement, plot_by_id\n",
     "\n",
-    "STATION = qc.station.Station(qdac)\n",
-    "qc.new_experiment(\"QDAC\", \"TestIV\"+ctime())\n",
+    "STATION = Station(qdac)\n",
+    "new_experiment(\"QDAC\", \"TestIV\"+ctime())\n",
     "meas = Measurement()\n",
     "meas.register_parameter(qdac.ch01.v)  # register the independent parameter\n",
     "meas.register_parameter(qdac.ch01.i, setpoints=(qdac.ch01.v,))  # now register the dependent one\n",
@@ -312,8 +312,7 @@
     "                            (qdac.ch01.i, get_i))\n",
     "        print(set_v, get_i)\n",
     "    dataset = datasaver.dataset\n",
-    "myplot = plot_by_id(dataset.run_id)\n",
-    "qc.dataset.plotting.plt.show()      # Sometimes it is necessasry to out-comment this line in Jupyter...."
+    "myplot = plot_by_id(dataset.run_id)"
    ]
   },
   {

diff --git a/docs/examples/QDevil/QDAC2/AWG.ipynb b/docs/examples/QDevil/QDAC2/AWG.ipynb
diff --git a/docs/examples/QDevil/QDAC2/Chaining.ipynb b/docs/examples/QDevil/QDAC2/Chaining.ipynb
diff --git a/docs/examples/QDevil/QDAC2/DC_Constant.ipynb b/docs/examples/QDevil/QDAC2/DC_Constant.ipynb
diff --git a/docs/examples/QDevil/QDAC2/List.ipynb b/docs/examples/QDevil/QDAC2/List.ipynb
diff --git a/docs/examples/QDevil/QDAC2/MultiGenerator.ipynb b/docs/examples/QDevil/QDAC2/MultiGenerator.ipynb
diff --git a/docs/examples/QDevil/QDAC2/PyvisaAwg.ipynb b/docs/examples/QDevil/QDAC2/PyvisaAwg.ipynb
diff --git a/docs/examples/QDevil/QDAC2/Scan.ipynb b/docs/examples/QDevil/QDAC2/Scan.ipynb
diff --git a/docs/examples/QDevil/QDAC2/Sine.ipynb b/docs/examples/QDevil/QDAC2/Sine.ipynb
diff --git a/docs/examples/QDevil/QDAC2/Square.ipynb b/docs/examples/QDevil/QDAC2/Square.ipynb
diff --git a/docs/examples/QDevil/QDAC2/Sweep.ipynb b/docs/examples/QDevil/QDAC2/Sweep.ipynb
diff --git a/docs/examples/QDevil/QDAC2/SyncMultipleQDACs.ipynb b/docs/examples/QDevil/QDAC2/SyncMultipleQDACs.ipynb
diff --git a/docs/examples/QDevil/QDAC2/Triangle.ipynb b/docs/examples/QDevil/QDAC2/Triangle.ipynb
diff --git a/docs/examples/QDevil/QDAC2/VirtualGates.ipynb b/docs/examples/QDevil/QDAC2/VirtualGates.ipynb
diff --git a/docs/examples/Rohde_Schwarz_SMW200A.ipynb b/docs/examples/Rohde_Schwarz_SMW200A.ipynb
@@ -20,7 +20,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from qcodes.instrument_drivers.rohde_schwarz.SMW200A import RohdeSchwarz_SMW200A as smw200a"
+    "from qcodes_contrib_drivers.drivers.RohdeSchwarz.SMW200A import RohdeSchwarz_SMW200A as smw200a"
    ]
   },
   {

diff --git a/docs/examples/Shamrock_SR750.ipynb b/docs/examples/Shamrock_SR750.ipynb
@@ -18,7 +18,7 @@
    },
    "outputs": [],
    "source": [
-    "from qcodes.instrument_drivers.Shamrock.SR750 import Shamrock_SR750"
+    "from qcodes_contrib_drivers.drivers.Shamrock.SR750 import Shamrock_SR750"
    ]
   },
   {

diff --git a/docs/examples/Thorlabs_MFF10x.ipynb b/docs/examples/Thorlabs_MFF10x.ipynb
@@ -18,8 +18,8 @@
    },
    "outputs": [],
    "source": [
-    "from qcodes.instrument_drivers.Thorlabs.APT import Thorlabs_APT\n",
-    "from qcodes.instrument_drivers.Thorlabs.MFF10x import Thorlabs_MFF10x"
+    "from qcodes_contrib_drivers.drivers.Thorlabs.APT import Thorlabs_APT\n",
+    "from qcodes_contrib_drivers.drivers.Thorlabs.MFF10x import Thorlabs_MFF10x"
    ]
   },
   {
@@ -172,7 +172,7 @@
  "metadata": {
   "hide_input": false,
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "qcodespip311",
    "language": "python",
    "name": "python3"
   },
@@ -186,7 +186,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.11.0 | packaged by conda-forge | (main, Jan 16 2023, 14:12:30) [MSC v.1916 64 bit (AMD64)]"
   },
   "nbsphinx": {
    "execute": "never"
@@ -232,6 +232,11 @@
     "_Feature"
    ],
    "window_display": false
+  },
+  "vscode": {
+   "interpreter": {
+    "hash": "7ac3e91929df5618782934af11c3fa566d637713ed5d04bf73eff1f535fb8e06"
+   }
   }
  },
  "nbformat": 4,

diff --git a/docs/examples/Thorlabs_PRM1Z8.ipynb b/docs/examples/Thorlabs_PRM1Z8.ipynb
@@ -18,8 +18,8 @@
    },
    "outputs": [],
    "source": [
-    "from qcodes.instrument_drivers.Thorlabs.APT import Thorlabs_APT\n",
-    "from qcodes.instrument_drivers.Thorlabs.PRM1Z8 import Thorlabs_PRM1Z8"
+    "from qcodes_contrib_drivers.drivers.Thorlabs.APT import Thorlabs_APT\n",
+    "from qcodes_contrib_drivers.drivers.Thorlabs.PRM1Z8 import Thorlabs_PRM1Z8"
    ]
   },
   {

diff --git a/pyproject.toml b/pyproject.toml
@@ -2,7 +2,7 @@
 requires = [
     "setuptools >= 61.2",
     "wheel >= 0.29.0",
-    "versioningit >= 1.1.0"
+    "versioningit >= 2.0.1"
 ]
 build-backend = 'setuptools.build_meta'
 
@@ -11,7 +11,7 @@ name = "qcodes_contrib_drivers"
 description = "User contributed drivers for QCoDeS"
 classifiers = [ "Development Status :: 3 - Alpha", "Intended Audience :: Science/Research", "License :: OSI Approved :: MIT License", "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Topic :: Scientific/Engineering",]
 requires-python = ">=3.8"
-dependencies = [ "qcodes>=0.36.1", "versioningit>=1.1.0", "packaging"]
+dependencies = [ "qcodes>=0.37.0", "versioningit>=2.0.1", "packaging"]
 dynamic = [ "version",]
 
 [[project.maintainers]]

diff --git a/qcodes_contrib_drivers/drivers/Attocube/ANC300.py b/qcodes_contrib_drivers/drivers/Attocube/ANC300.py
@@ -18,15 +18,15 @@
 import pyvisa
 
 # real mode:
-from qcodes import VisaInstrument
+from qcodes.instrument import VisaInstrument
 # simulation mode:
-#from qcodes.instrument_drivers.attocube.ANC300sim import MockVisa
+#from qcodes_contrib_drivers.drivers.Attocube.ANC300sim import MockVisa
 
 ## do not forget to change the main class accordingly:
 ## real  -> class ANC300(VisaInstrument):
 ## simul -> class ANC300(MockVisa):
 
-from qcodes.instrument.channel import InstrumentChannel, ChannelList
+from qcodes.instrument import InstrumentChannel, ChannelList
 from qcodes import validators as vals
 
 
@@ -38,7 +38,7 @@ class Anc300Axis(InstrumentChannel):
 
     def __init__(self, parent: 'ANC300', name: str, axis: int, sn: str) -> None:
         """Creates a new Anc300Axis class instance.
-        
+
         The Attocube ANC300 piezo controller has up to 7 axis. Each of them are controlled
         by the same class.
 
@@ -317,10 +317,10 @@ class Anc300TriggerOut(InstrumentChannel):
 
     def __init__(self, parent: 'ANC300', name: str, num: int) -> None:
         """The Attocube ANC300 piezo controller has three trigger outputs.
-        
+
         This function cannot be tested because this function belongs to a specific controller
         feature code. This code was not available during the tests.
-        
+
         Args:
             parent: the internal QCoDeS name of the instrument this output belongs to
             name: the internal QCoDeS name of the output itself
@@ -345,7 +345,7 @@ class ANC300(VisaInstrument):
 #class ANC300(MockVisa):
     """
     This is the qcodes driver for the Attocube ANC300.
-    
+
     Be careful to correct the parameters if not useing the USB port.
 
     Status:
@@ -402,7 +402,7 @@ def __init__(self, name, address, **kwargs):
 
     def write_raw(self, cmd: str) -> None:
         """Write cmd and wait until the 'OK' or 'ERROR' comes back from the device.
-        
+
         Args:
             cmd: Command to write to controller.
 
@@ -430,7 +430,7 @@ def write_raw(self, cmd: str) -> None:
 
     def ask_raw(self, cmd: str) -> str:
         """Query instrument with cmd and return response.
-        
+
         Args:
             cmd: Command to write to controller.
 

diff --git a/qcodes_contrib_drivers/drivers/Attocube/ANC300sim.py b/qcodes_contrib_drivers/drivers/Attocube/ANC300sim.py
@@ -8,7 +8,7 @@
 """
 
 import pyvisa
-from qcodes.instrument.visa import VisaInstrument
+from qcodes.instrument import VisaInstrument
 
 # if set to True, every communication line is printed
 _USE_DEBUG = True
@@ -31,7 +31,7 @@ class MockVisaHandle:
     """
     Simulate the API needed for the communication.
     """
-    
+
     # List of possible commands asked the instrument to give a realistic answer.
     cmddef = {'ver': ['attocube ANC300 controller version 1.1.0-1304 2013-10-17 08:16',
                       'ANC150 compatibillity console'],
@@ -107,7 +107,7 @@ class MockVisaHandle:
               'gettd 5': ['Wrong axis type','ERROR'],
               'gettd 6': ['Wrong axis type','ERROR'],
               'gettd 7': ['Wrong axis type','ERROR'],
-              
+
               'getc 1':  ['cap = 5 nF'], # TODO
               'getc 2':  ['cap = 5 nF'], # TODO
               'getc 3':  ['Wrong axis type','ERROR'],
@@ -123,7 +123,7 @@ class MockVisaHandle:
               # There is no simulation for the correct movement
 
               }
-    
+
     def __init__(self):
         if _USE_DEBUG:
             print("DBG-Mock: init")

diff --git a/qcodes_contrib_drivers/drivers/Oxford/kelvinox.py b/qcodes_contrib_drivers/drivers/Oxford/kelvinox.py
@@ -10,9 +10,10 @@
 
 from time import sleep
 import pyvisa
+import pyvisa.constants
 import logging
 import numpy
-from qcodes import VisaInstrument
+from qcodes.instrument import VisaInstrument
 from qcodes import validators as vals
 from functools import partial
 
@@ -27,7 +28,7 @@ class OxfordInstruments_Kelvinox_IGH(VisaInstrument):
 
     Usage:
     Initialize with
-    fridge = qcodes.instrument_drivers.oxford.kelvinox.OxfordInstruments_Kelvinox_IGH(name='fridge', address='ASRL4::INSTR')
+    fridge = qcodes_contrib_drivers.drivers.oxford.kelvinox.OxfordInstruments_Kelvinox_IGH(name='fridge', address='ASRL4::INSTR')
 
     Note: Since the ISOBUS allows for several instruments to be managed in parallel, the command
     which is sent to the device starts with '@n', where n is the ISOBUS instrument number.