Merge branch 'master' into improve_rohdeschwarz_drivers

CONTRIBUTING.rst

@@ -32,10 +32,10 @@ drivers will not be reviewed and/or merged with the QCoDeS core.
 Bugs reports and feature requests
 ---------------------------------
 
-We use github's `issues <https://github.com/qdev-dk/Qcodes/issues>`__.
+We use github's `issues <https://github.com/QCoDeS/Qcodes/issues>`__.
 Search for existing and closed issues. If your problem or idea is not yet
 addressed, `please open a new issue
-<https://github.com/qdev-dk/Qcodes/issues/new>`__
+<https://github.com/QCoDeS/Qcodes/issues/new>`__
 
 The github GUI will show you a template both for bugs and features.
 Delete the wrong part and try to follow the template. Writing a good

docs/changes/0.12.0.rst

@@ -0,0 +1,9 @@
+Changelog for QCoDeS 0.12.0
+===========================
+
+The March 2020 release of QCoDeS
+
+
+Deprecations:
+-------------
+* The `DataSet` method `add_result` is now deprecated in favour of the `add_results` method. (#1926)

docs/changes/index.rst

@@ -25,4 +25,4 @@ Changelogs
    0.8.1 <0.8.1>
    0.9.0 <0.9.0>
    0.10.0 <0.10.0>
-
+   0.12.0 <0.12.0>

docs/examples/15_minutes_to_QCoDeS.ipynb

@@ -75,20 +75,27 @@
    "source": [
     "%matplotlib inline\n",
     "import os\n",
-    "import numpy.random as rd\n",
-    "import matplotlib.pyplot as plt\n",
     "from functools import partial\n",
-    "import numpy as np\n",
-    "\n",
-    "from time import sleep, monotonic\n",
+    "from time import sleep\n",
     "\n",
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
     "import qcodes as qc\n",
-    "from qcodes import Station, load_or_create_experiment, \\\n",
-    "    initialise_database, Measurement, load_by_run_spec, load_by_guid, initialise_or_create_database_at\n",
-    "from qcodes import load_last_experiment, load_experiment, new_experiment, experiments\n",
-    "from qcodes.tests.instrument_mocks import DummyInstrument\n",
+    "from qcodes import (\n",
+    "    Measurement,\n",
+    "    experiments,\n",
+    "    initialise_database,\n",
+    "    initialise_or_create_database_at,\n",
+    "    load_by_guid,\n",
+    "    load_by_run_spec,\n",
+    "    load_experiment,\n",
+    "    load_last_experiment,\n",
+    "    load_or_create_experiment,\n",
+    "    new_experiment,\n",
+    ")\n",
     "from qcodes.dataset.plotting import plot_dataset\n",
-    "from qcodes.logger.logger import start_all_logging"
+    "from qcodes.logger.logger import start_all_logging\n",
+    "from qcodes.tests.instrument_mocks import DummyInstrument"
    ]
   },
   {