Merge branch 'master' into v0.2.x

microsoft · Apr 16, 2019 · 44ec643 · 44ec643
2 parents e2610f1 + 216d7d7
commit 44ec643
Show file tree

Hide file tree

Showing 10 changed files with 1,217 additions and 1,212 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -56,6 +56,8 @@ script:
     - py.test --cov=qcodes --cov-report xml --cov-config=.coveragerc
     - cd ..
     - mypy qcodes
+    # check that line endings are correct avoiding mixed windows/unix style line endings
+    - pylint --reports=n --disable=all --enable=mixed-line-endings,unexpected-line-ending-format --expected-line-ending-format=LF qcodes
     # run benchmarks to make sure they are correct
     - |
       cd benchmarking

diff --git a/qcodes/instrument_drivers/HP/HP8133A.py b/qcodes/instrument_drivers/HP/HP8133A.py
@@ -1,90 +1,89 @@
-from qcodes import VisaInstrument
-from qcodes.utils.validators import Numbers, Ints, Enum
-
-
-class HP8133A(VisaInstrument):
-    """
-    This is the code for Hewlett Packard 8133A Pulse Generator
-    """
-
-    def __init__(self, name, address, reset=False,  **kwargs):
-        super().__init__(name, address,  terminator='\n', **kwargs)
-
-        self.add_parameter(name='frequency',
-                           label='Frequency',
-                           unit='Hz',
-                           get_cmd='FREQ?',
-                           set_cmd='FREQ {}',
-                           get_parser=float,
-                           vals=Numbers(min_value=31.3e6,
-                                        max_value=3.5e9))
-        self.add_parameter(name='period',
-                           label='Period',
-                           unit='s',
-                           get_cmd='PER?',
-                           set_cmd='PER {}',
-                           get_parser=float,
-                           vals=Numbers(min_value=286e-12,
-                                        max_value=31.949e-9))
-        self.add_parameter(name='phase',
-                           label='Phase',
-                           unit='deg',
-                           get_cmd='PHAS?',
-                           set_cmd='PHAS {}',
-                           get_parser=float,
-                           vals=Numbers(min_value=-3.6e3,
-                                        max_value=3.6e3))
-        self.add_parameter(name='duty_cycle',
-                           label='Duty cycle',
-                           unit='%',
-                           get_cmd='DCYC?',
-                           set_cmd='DCYC {}',
-                           get_parser=float,
-                           vals=Numbers(min_value=0,
-                                        max_value=100))
-        self.add_parameter(name='delay',
-                           label='Delay',
-                           unit='s',
-                           get_cmd='DEL?',
-                           set_cmd='DEL {}',
-                           get_parser=float,
-                           vals=Numbers(min_value=-5e-9,
-                                        max_value=5e-9))
-        self.add_parameter(name='width',
-                           label='Width',
-                           unit='s',
-                           get_cmd='WIDT?',
-                           set_cmd='WIDT {}',
-                           get_parser=float,
-                           vals=Numbers(min_value=1e-12,
-                                        max_value=10.5e-9))
-        self.add_parameter(name='amplitude',
-                           label='Amplitude',
-                           unit='V',
-                           get_cmd='VOLT?',
-                           set_cmd='VOLT {}',
-                           get_parser=float,
-                           vals=Numbers(min_value=0.1,
-                                        max_value=3.3))
-        self.add_parameter(name='amplitude_offset',
-                           label='Offset',
-                           unit='V',
-                           get_cmd='VOLT:OFFS?',
-                           set_cmd='VOLT:OFFS {}',
-                           get_parser=float,
-                           vals=Numbers(min_value=-2.95,
-                                        max_value=3.95))
-        self.add_parameter(name='output',
-                           label='Output',
-                           get_cmd='OUTP?',
-                           set_cmd='OUTP {}',
-                           val_mapping={'OFF': 0,
-                                        'ON': 1})
-
-        #resets amplitude and offset each time user connects
-        self.amplitude(0.1)
-        self.amplitude_offset(0)
-
-
-        self.add_function('reset', call_cmd='*RST')
-        self.connect_message()
+from qcodes import VisaInstrument
+from qcodes.utils.validators import Numbers, Ints, Enum
+
+
+class HP8133A(VisaInstrument):
+    """
+    This is the code for Hewlett Packard 8133A Pulse Generator
+    """
+
+    def __init__(self, name, address, reset=False,  **kwargs):
+        super().__init__(name, address,  terminator='\n', **kwargs)
+
+        self.add_parameter(name='frequency',
+                           label='Frequency',
+                           unit='Hz',
+                           get_cmd='FREQ?',
+                           set_cmd='FREQ {}',
+                           get_parser=float,
+                           vals=Numbers(min_value=31.3e6,
+                                        max_value=3.5e9))
+        self.add_parameter(name='period',
+                           label='Period',
+                           unit='s',
+                           get_cmd='PER?',
+                           set_cmd='PER {}',
+                           get_parser=float,
+                           vals=Numbers(min_value=286e-12,
+                                        max_value=31.949e-9))
+        self.add_parameter(name='phase',
+                           label='Phase',
+                           unit='deg',
+                           get_cmd='PHAS?',
+                           set_cmd='PHAS {}',
+                           get_parser=float,
+                           vals=Numbers(min_value=-3.6e3,
+                                        max_value=3.6e3))
+        self.add_parameter(name='duty_cycle',
+                           label='Duty cycle',
+                           unit='%',
+                           get_cmd='DCYC?',
+                           set_cmd='DCYC {}',
+                           get_parser=float,
+                           vals=Numbers(min_value=0,
+                                        max_value=100))
+        self.add_parameter(name='delay',
+                           label='Delay',
+                           unit='s',
+                           get_cmd='DEL?',
+                           set_cmd='DEL {}',
+                           get_parser=float,
+                           vals=Numbers(min_value=-5e-9,
+                                        max_value=5e-9))
+        self.add_parameter(name='width',
+                           label='Width',
+                           unit='s',
+                           get_cmd='WIDT?',
+                           set_cmd='WIDT {}',
+                           get_parser=float,
+                           vals=Numbers(min_value=1e-12,
+                                        max_value=10.5e-9))
+        self.add_parameter(name='amplitude',
+                           label='Amplitude',
+                           unit='V',
+                           get_cmd='VOLT?',
+                           set_cmd='VOLT {}',
+                           get_parser=float,
+                           vals=Numbers(min_value=0.1,
+                                        max_value=3.3))
+        self.add_parameter(name='amplitude_offset',
+                           label='Offset',
+                           unit='V',
+                           get_cmd='VOLT:OFFS?',
+                           set_cmd='VOLT:OFFS {}',
+                           get_parser=float,
+                           vals=Numbers(min_value=-2.95,
+                                        max_value=3.95))
+        self.add_parameter(name='output',
+                           label='Output',
+                           get_cmd='OUTP?',
+                           set_cmd='OUTP {}',
+                           val_mapping={'OFF': 0,
+                                        'ON': 1})
+
+        # resets amplitude and offset each time user connects
+        self.amplitude(0.1)
+        self.amplitude_offset(0)
+
+        self.add_function('reset', call_cmd='*RST')
+        self.connect_message()