Merge branch 'master' into patch-1

qcodes_contrib_drivers/drivers/NationalInstruments/Switch.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Dict, List, Optional, cast
+from typing import Dict, List, Optional
 
 from niswitch import PathCapability, Session
 from qcodes import ChannelList, Instrument, InstrumentChannel
@@ -118,7 +118,7 @@ def _read_connections(self) -> List[str]:
         self._update_connection_list()
         return [ch.short_name for ch in self.connection_list]
 
-    def connect_to(self, other: "InstrumentChannel") -> None:
+    def connect_to(self, other: "SwitchChannel") -> None:
         """
         Connect this channel to another channel. If either of the channels is
         already connected to something else, disconnect both channels first. If
@@ -143,7 +143,7 @@ def connect_to(self, other: "InstrumentChannel") -> None:
         self.connection_list.append(other)
         other.connection_list.append(self)
 
-    def disconnect_from(self, other: "InstrumentChannel") -> None:
+    def disconnect_from(self, other: "SwitchChannel") -> None:
         """
         Disconnect this channel from another chanel. If the channels are not
         connected, raises a ``DriverError``.