Run tests in parallel

.travis.yml

@@ -71,7 +71,8 @@ script:
       pip uninstall -y qcodes
       pip install .
     - cd qcodes
-    - py.test --cov=qcodes --cov-report xml --cov-config=.coveragerc
+    - py.test -m "not serial" --cov=qcodes --cov-report xml --cov-config=.coveragerc
+    - py.test -n 1 -m serial --cov-append --cov=qcodes --cov-report xml --cov-config=.coveragerc
     - cd ..
     - mypy qcodes
     # check that line endings are correct avoiding mixed windows/unix style line endings

azure-pipelines.yml

@@ -95,14 +95,16 @@ jobs:
       - bash: |
           source activate qcodes &&
           cd qcodes &&
-          pytest --junitxml=test-results.xml --cov=qcodes --cov-report=xml --cov-config=.coveragerc
+          pytest -m "not serial" --junitxml=test-parallel-results.xml --cov=qcodes --cov-report=xml --cov-config=.coveragerc &&
+          pytest -n 1 -m serial --junitxml=test-serial-results.xml --cov-append --cov=qcodes --cov-report=xml --cov-config=.coveragerc
         displayName: "Pytest on Windows"
         condition: and(succeededOrFailed(), eq( variables['Agent.OS'], 'Windows_NT' ))
       - bash: |
           source activate qcodes &&
           cd qcodes &&
           xvfb-run --server-args="-screen 0 1024x768x24" \
-            pytest --junitxml=test-results.xml --cov=qcodes --cov-report=xml --cov-config=.coveragerc
+            pytest -m "not serial" --junitxml=test-parallel-results.xml --cov=qcodes --cov-report=xml --cov-config=.coveragerc &&
+            pytest -n 1 -m serial --junitxml=test-serial-results.xml --cov-append --cov=qcodes --cov-report=xml --cov-config=.coveragerc
         displayName: "Pytest on Linux"
         condition: and(succeededOrFailed(), eq( variables['Agent.OS'], 'Linux' ))
       - task: PublishTestResults@2

docs/api/index.rst

@@ -21,7 +21,7 @@ QCoDeS API
    instrument/index
    parameters/index
    logger/index
-   math/index
+   math_utils/index
    monitor/index
    station
    utils/index

docs/api/math/field_vector.rst → docs/api/math_utils/field_vector.rst

@@ -1,5 +1,5 @@
 qcodes.math.field_vector
 ------------------------
 
-.. automodule:: qcodes.math.field_vector
+.. automodule:: qcodes.math_utils.field_vector
    :members:

docs/api/math/index.rst → docs/api/math_utils/index.rst

@@ -5,11 +5,11 @@ qcodes.math
 
 .. autosummary::
 
-    qcodes.math
-    qcodes.math.field_vector
+    qcodes.math_utils
+    qcodes.math_utils.field_vector
 
 
-.. automodule:: qcodes.math
+.. automodule:: qcodes.math_utils
 
 
 .. toctree::

docs/changes/0.16.0.rst

@@ -0,0 +1,7 @@
+Changelog for QCoDeS 0.16.0 (not released yet)
+==============================================
+
+Breaking Changes:
+_________________
+
+* ``math`` has been renamed as ``math_utils`` (#2040).

docs/changes/index.rst

@@ -31,3 +31,4 @@ Changelogs
    0.13.0 <0.13.0>
    0.14.0 <0.14.0>
    0.15.0a1 <0.15.0a1>
+   0.16.0 <0.16.0>

docs/examples/driver_examples/Qcodes example with AMI430.ipynb

@@ -53,7 +53,7 @@
     "import matplotlib.pyplot as plt \n",
     "\n",
     "from qcodes.instrument_drivers.american_magnetics.AMI430 import AMI430, AMI430_3D\n",
-    "from qcodes.math.field_vector import FieldVector"
+    "from qcodes.math_utils.field_vector import FieldVector"
    ]
   },
   {

docs/examples/driver_examples/Qcodes example with Oxford Mercury iPS.ipynb

@@ -506,7 +506,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.2"
+   "version": "3.7.5"
   },
   "nbsphinx": {
    "execute": "never"

pytest.ini

@@ -1,2 +1,8 @@
 [pytest]
-junit_family=legacy
+junit_family=legacy
+
+addopts =
+    	-n 2
+    	--dist=loadfile
+
+markers = serial

qcodes/dataset/data_set.py

@@ -172,8 +172,6 @@ def _exhaust_queue(queue: Queue) -> List:
     def _call_callback_on_queue_data(self) -> None:
         result_list = self._exhaust_queue(self.data_queue)
         self.callback(result_list, self._data_set_len, self.state)
-        self.log.debug(f"{self.callback} called with "
-                       f"result_list: {result_list}.")
 
     def _loop(self) -> None:
         while True:
@@ -192,7 +190,6 @@ def _loop(self) -> None:
                 break
 
     def done_callback(self) -> None:
-        self.log.debug("Done callback")
         self._call_callback_on_queue_data()
 
     def schedule_stop(self) -> None:

qcodes/instrument_drivers/american_magnetics/AMI430.py

@@ -9,7 +9,7 @@
 
 from qcodes import Instrument, IPInstrument, InstrumentChannel
 from qcodes.utils.deprecate import deprecate
-from qcodes.math.field_vector import FieldVector
+from qcodes.math_utils.field_vector import FieldVector
 from qcodes.utils.validators import Bool, Numbers, Ints, Anything
 
 log = logging.getLogger(__name__)

qcodes/instrument_drivers/oxford/MercuryiPS_VISA.py

@@ -8,7 +8,7 @@
 
 from qcodes.instrument.channel import InstrumentChannel
 from qcodes.instrument.visa import VisaInstrument
-from qcodes.math.field_vector import FieldVector
+from qcodes.math_utils.field_vector import FieldVector
 
 log = logging.getLogger(__name__)
 visalog = logging.getLogger('qcodes.instrument.visa')

qcodes/tests/conftest.py

@@ -29,11 +29,12 @@ def disable_telemetry():
     finally:
         qc.config.telemetry.enabled = original_state
 
+
 @pytest.fixture(scope="session", autouse=True)
 def disable_config_subscriber():
     """
     We do not want the tests to send generate subscription events unless specifically
-    enabled in the test. So disable any default subscriber defined
+    enabled in the test. So disable any default subscriber defined.
     """
 
     original_state = qc.config.subscription.default_subscribers

qcodes/tests/dataset/test_measurement_context_manager.py

@@ -725,6 +725,7 @@ def collect_x_vals(results, length, state):
     assert collected_x_vals == given_x_vals
 
 
+@pytest.mark.serial
 @pytest.mark.flaky(reruns=5)
 @settings(deadline=None, max_examples=25)
 @given(N=hst.integers(min_value=2000, max_value=3000))

qcodes/tests/dataset/test_subscribing.py

@@ -66,6 +66,7 @@ def subscriber(results: List[Tuple[VALUE]], length: int,
     return subscriber
 
 
+@pytest.mark.serial
 def test_basic_subscription(dataset, basic_subscriber):
     xparam = ParamSpecBase(name='x',
                            paramtype='numeric',

qcodes/tests/drivers/test_MercuryiPS.py

@@ -6,7 +6,7 @@
 
 from qcodes.instrument_drivers.oxford.MercuryiPS_VISA import MercuryiPS
 import qcodes.instrument.sims as sims
-from qcodes.math.field_vector import FieldVector
+from qcodes.math_utils.field_vector import FieldVector
 
 visalib = sims.__file__.replace('__init__.py', 'MercuryiPS.yaml@sim')
 

qcodes/tests/drivers/test_ami430.py

@@ -14,7 +14,7 @@
 from qcodes.instrument_drivers.american_magnetics.AMI430 import AMI430_3D, \
     AMI430Warning
 from qcodes.instrument.ip_to_visa import AMI430_VISA
-from qcodes.math.field_vector import FieldVector
+from qcodes.math_utils.field_vector import FieldVector
 from qcodes.utils.types import numpy_concrete_ints, numpy_concrete_floats, \
     numpy_non_concrete_ints_instantiable, \
     numpy_non_concrete_floats_instantiable

qcodes/tests/test_data.py

@@ -4,6 +4,7 @@
 import pickle
 import logging
 
+from qcodes.data.location import FormatLocation
 from qcodes.data.data_array import DataArray
 from qcodes.data.io import DiskIO
 from qcodes.data.data_set import load_data, new_data, DataSet
@@ -446,12 +447,18 @@ def test_write_copy(self):
     def test_pickle_dataset(self):
         # Test pickling of DataSet object
         # If the data_manager is set to None, then the object should pickle.
-        m = DataSet2D()
+        loc_fmt = 'data/{date}/#{counter}_{name}_{date}_{time}'
+        rcd = {'name': 'test_pickle_dataset'}
+        loc_provider = FormatLocation(fmt=loc_fmt, record=rcd)
+        m = DataSet2D(location=loc_provider)
         pickle.dumps(m)
 
     def test_default_parameter(self):
+        loc_fmt = 'data/{date}/#{counter}_{name}_{date}_{time}'
+        rcd = {'name': 'test_default_parameter'}
+        loc_provider = FormatLocation(fmt=loc_fmt, record=rcd)
         # Test whether the default_array function works
-        m = DataSet2D()
+        m = DataSet2D(location=loc_provider)
 
         # test we can run with default arguments
         name = m.default_parameter_name()
@@ -560,7 +567,10 @@ def test_complete(self):
         self.assertEqual(log_index, len(logs), logs)
 
     def test_remove_array(self):
-        m = DataSet2D()
+        loc_fmt = 'data/{date}/#{counter}_{name}_{date}_{time}'
+        rcd = {'name': 'test_remove_array'}
+        loc_provider = FormatLocation(fmt=loc_fmt, record=rcd)
+        m = DataSet2D(location=loc_provider)
         m.remove_array('z')
         _ = m.__repr__()
         self.assertFalse('z' in m.arrays)

qcodes/tests/test_field_vector.py

@@ -8,7 +8,7 @@
 from hypothesis.strategies import floats
 from hypothesis.strategies import tuples
 
-from qcodes.math.field_vector import FieldVector
+from qcodes.math_utils.field_vector import FieldVector
 from qcodes.utils.helpers import NumpyJSONEncoder
 
 random_coordinates = {

qcodes/tests/test_format.py

@@ -1,6 +1,7 @@
 from unittest import TestCase
 import os
 
+from qcodes.data.location import FormatLocation
 from qcodes.data.format import Formatter
 from qcodes.data.gnuplot_format import GNUPlotFormat
 
@@ -24,7 +25,10 @@ def tearDown(self):
 
     def test_overridable_methods(self):
         formatter = Formatter()
-        data = DataSet1D()
+        loc_fmt = 'data/{date}/#{counter}_{name}_{date}_{time}'
+        rcd = {'name': 'test_overridable_methods'}
+        loc_provider = FormatLocation(fmt=loc_fmt, record=rcd)
+        data = DataSet1D(location=loc_provider)
 
         with self.assertRaises(NotImplementedError):
             formatter.write(data, data.io, data.location)

qcodes/tests/test_measure.py

@@ -1,6 +1,7 @@
 from unittest import TestCase
 from datetime import datetime
 
+from qcodes.data.location import FormatLocation
 from qcodes.instrument.parameter import Parameter
 from qcodes.measure import Measure
 
@@ -55,7 +56,10 @@ def setUp(self):
 
 
     def test_metadata(self):
-        c = Measure(self.p1).run()
+        loc_fmt = 'data/{date}/#{counter}_{name}_{date}_{time}'
+        rcd = {'name': 'test_metadata'}
+        loc_provider = FormatLocation(fmt=loc_fmt, record=rcd)
+        c = Measure(self.p1).run(location=loc_provider)
         self.assertEqual(c.metadata['arrays']['this']['unit'], 'this unit')
         self.assertEqual(c.metadata['arrays']['this']['name'], 'this')
         self.assertEqual(c.metadata['arrays']['this']['label'], 'this label')
@@ -70,9 +74,14 @@ def test_metadata(self):
         self.assertEqual(c.metadata['arrays']['that']['shape'], (5,))
         assert_array_equal(c.that.ndarray, np.ones(5))
 
-        self.assertEqual(c.metadata['arrays']['this_setpoint_set']['unit'], 'this setpointunit')
-        self.assertEqual(c.metadata['arrays']['this_setpoint_set']['name'], 'this_setpoint')
-        self.assertEqual(c.metadata['arrays']['this_setpoint_set']['label'], 'this setpoint')
-        self.assertEqual(c.metadata['arrays']['this_setpoint_set']['is_setpoint'], True)
-        self.assertEqual(c.metadata['arrays']['this_setpoint_set']['shape'], (5,))
+        self.assertEqual(c.metadata['arrays']['this_setpoint_set']['unit'],
+                         'this setpointunit')
+        self.assertEqual(c.metadata['arrays']['this_setpoint_set']['name'],
+                         'this_setpoint')
+        self.assertEqual(c.metadata['arrays']['this_setpoint_set']['label'],
+                         'this setpoint')
+        self.assertEqual(c.metadata['arrays']['this_setpoint_set']
+                         ['is_setpoint'], True)
+        self.assertEqual(c.metadata['arrays']['this_setpoint_set']['shape'],
+                         (5,))
         assert_array_equal(c.this_setpoint_set.ndarray, np.linspace(5, 9, 5))

test_requirements.txt

@@ -2,6 +2,7 @@ coverage!=4.5.0
 pytest-cov
 pytest
 pytest-rerunfailures
+pytest-xdist
 codacy-coverage
 hypothesis<5.6.0 # large number of warnings due to change in 5.6.0 https://hypothesis.readthedocs.io/en/latest/changes.html#v5-6-0
 mypy==0.780