Skip to content

Commit ffb74da

Browse files
authored
Merge pull request #2 from QCoDeS/master
update fork
2 parents f12be0a + 11e2598 commit ffb74da

21 files changed

Lines changed: 2655 additions & 2470 deletions

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ indent-string=' '
322322
indent-after-paren=4
323323

324324
# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
325-
expected-line-ending-format=
325+
expected-line-ending-format=LF
326326

327327

328328
[BASIC]

docs/changes/0.9.0.rst

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,40 @@
1-
Changelog for QCoDeS 0.9.0
2-
==========================
1+
Changelog for QCoDeS 0.9.0rc1
2+
=============================
33

44
(NOTE RELEASED YET) The December 2019 release of QCoDeS
55

66
New:
77
____
88

9-
* ...
10-
9+
* Call ``start_all_logging`` on qcodes import.
10+
See this example_ for more details on how this can be configured. (#1850)
1111

1212
Improved:
1313
_________
1414

15-
* ...
16-
15+
* Improvements to dataset notebooks (#1813)
16+
* Fix warning in matplotlib plotting for legacy dataset (#1839)
17+
* Add electrical delay parameter and function set_electrical_delay_auto for ZNB driver (#1849)
18+
* Keysight 344xxA: Fix formatting issues (#1851)
19+
* Fix docstrings in parameter.py (#1855)
20+
* Update Infiniium.py: add option to save waveform to usb (#1716)
1721

1822
New Instrument drivers:
1923
_______________________
2024

21-
* ...
22-
25+
* Keysight 34980A driver (#1810, #1867)
2326

2427
Under the hood:
2528
_______________
2629

27-
* ...
28-
30+
* Move QCoDeS import into function that needs it to break potential circular import (#1870)
31+
* Fix return type of _BaseParameter.__call__ (#1839)
32+
* CI: Trigger azure pipeline on tags (#1837)
33+
* CI: Travis don't apt-get install (#1842)
34+
* CI: Travis Explicitly whitelist branches and tags to build (#1865)
35+
* CI: Check for consistent line ending using Codacy (#1866)
36+
* CI: Also trigger azure builds on release branches (#1868)
37+
* CI: Azure twine -r name should match service endpoint (#1869)
2938

3039
Breaking Changes:
3140
_________________
@@ -34,7 +43,6 @@ _________________
3443
* ``Parameter.set_validator`` method after long deprecation period has been
3544
removed (#1856)
3645

37-
3846
Deprecations:
3947
_____________
4048

@@ -45,11 +53,10 @@ _____________
4553
instrument drivers is deprecated now. Use ``Parameter.set`` and
4654
``Parameter.cache.set`` methods instead. (#1858)
4755

48-
4956
Recommended Dependencies:
5057
_________________________
5158

52-
* ...
53-
54-
59+
* Type checking should be done with Mypy 0.750. (#1863)
60+
* Docs are build using Sphinx 2.2.2 (#1864)
5561

62+
.. _example: ../examples/logging/logging_example.ipynb

docs/dataset/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The **experiment-ID** provides the link to the experiment that this dataset belo
6262

6363
The **name** must be provided by the user at creation time.
6464

65-
The **table of results** is where the actual *data* of the ``DataSet`` resides. The table has a number of associated **parameters** as columns with data points as rows. The parameters may be QCoDeS ``Parameters``, but are not limited to that. The preferred procedure for associating parameters with a run and adding data is via the ``Measurement`` object as described in the :doc:`Measurement Object Example Notebook <../examples/DataSet/Dataset Context Manager>`. The deep thinking behind how different parameters relate to and depend on each other within a ``DataSet`` is explained in :ref:`interdependentparams`.
65+
The **table of results** is where the actual *data* of the ``DataSet`` resides. The table has a number of associated **parameters** as columns with data points as rows. The parameters may be QCoDeS ``Parameters``, but are not limited to that. The preferred procedure for associating parameters with a run and adding data is via the ``Measurement`` object as described in the :doc:`Measurement Object Example Notebook <../examples/DataSet/Performing-measurements-using-qcodes-parameters-and-dataset>`. The deep thinking behind how different parameters relate to and depend on each other within a ``DataSet`` is explained in :ref:`interdependentparams`.
6666

6767
The **start time** is automatically added upon creation, and the **end time** is added when (if ever) the user decides to mark the run as *completed* after which point no more data points may be added.
6868

docs/examples/15_minutes_to_QCoDeS.ipynb

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"cell_type": "markdown",
9494
"metadata": {},
9595
"source": [
96-
"In every measurement session, it is highly recommended to have QCoDeS logging turned on. This will allow you to have all the logs in case troubleshooting is required. To enable logging, we add the following single line of code at the beginnig of our scripts after the imports:"
96+
"In every measurement session, it is highly recommended to have QCoDeS logging turned on. This will allow you to have all the logs in case troubleshooting is required. To enable logging, we can either add the following single line of code at the beginnig of our scripts after the imports:"
9797
]
9898
},
9999
{
@@ -121,6 +121,24 @@
121121
"start_all_logging()"
122122
]
123123
},
124+
{
125+
"cell_type": "markdown",
126+
"metadata": {},
127+
"source": [
128+
"or we can configure qcodes to automatically start logging on every import of qcodes, by running the following code once. (This will persist the current configuration in `~\\qcodesrc.json`)"
129+
]
130+
},
131+
{
132+
"cell_type": "code",
133+
"execution_count": 2,
134+
"metadata": {},
135+
"outputs": [],
136+
"source": [
137+
"from qcodes import config\n",
138+
"config.logger.start_logging_on_import = 'always'\n",
139+
"config.save_to_home()"
140+
]
141+
},
124142
{
125143
"cell_type": "markdown",
126144
"metadata": {},
@@ -1155,7 +1173,7 @@
11551173
"cell_type": "markdown",
11561174
"metadata": {},
11571175
"source": [
1158-
"We refer reader to [exporting data section of the Dataset Context Manager notebook](DataSet/Dataset%20Context%20Manager.ipynb#Exporting-data) and [Accessing data in DataSet notebook](DataSet/Accessing-data-in-DataSet.ipynb) for further information on `get_parameter_data` method."
1176+
"We refer reader to [exporting data section of the performing measurements using qcodes parameters and dataset](DataSet/Performing-measurements-using-qcodes-parameters-and-dataset.ipynb#Exporting-data) and [Accessing data in DataSet notebook](DataSet/Accessing-data-in-DataSet.ipynb) for further information on `get_parameter_data` method."
11591177
]
11601178
},
11611179
{
@@ -1362,5 +1380,5 @@
13621380
}
13631381
},
13641382
"nbformat": 4,
1365-
"nbformat_minor": 2
1383+
"nbformat_minor": 4
13661384
}

docs/examples/DataSet/Accessing-data-in-DataSet.ipynb

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"source": [
1616
"## Preparation: a DataSet from a dummy Measurement\n",
1717
"\n",
18-
"In order to obtain a `DataSet` object, we are going to run a `Measurement` storing some dummy data (see [Dataset Context Manager](Dataset%20Context%20Manager.ipynb) notebook for more details)."
18+
"In order to obtain a `DataSet` object, we are going to run a `Measurement` storing some dummy data (see notebook on [Performing measurements using qcodes parameters and dataset](Performing-measurements-using-qcodes-parameters-and-dataset.ipynb) notebook for more details)."
1919
]
2020
},
2121
{
@@ -1043,7 +1043,49 @@
10431043
"name": "python",
10441044
"nbconvert_exporter": "python",
10451045
"pygments_lexer": "ipython3",
1046-
"version": "3.7.4"
1046+
"version": "3.7.5"
1047+
},
1048+
"toc": {
1049+
"base_numbering": 1,
1050+
"nav_menu": {},
1051+
"number_sections": true,
1052+
"sideBar": true,
1053+
"skip_h1_title": false,
1054+
"title_cell": "Table of Contents",
1055+
"title_sidebar": "Contents",
1056+
"toc_cell": false,
1057+
"toc_position": {},
1058+
"toc_section_display": true,
1059+
"toc_window_display": false
1060+
},
1061+
"varInspector": {
1062+
"cols": {
1063+
"lenName": 16,
1064+
"lenType": 16,
1065+
"lenVar": 40
1066+
},
1067+
"kernels_config": {
1068+
"python": {
1069+
"delete_cmd_postfix": "",
1070+
"delete_cmd_prefix": "del ",
1071+
"library": "var_list.py",
1072+
"varRefreshCmd": "print(var_dic_list())"
1073+
},
1074+
"r": {
1075+
"delete_cmd_postfix": ") ",
1076+
"delete_cmd_prefix": "rm(",
1077+
"library": "var_list.r",
1078+
"varRefreshCmd": "cat(var_dic_list()) "
1079+
}
1080+
},
1081+
"types_to_exclude": [
1082+
"module",
1083+
"function",
1084+
"builtin_function_or_method",
1085+
"instance",
1086+
"_Feature"
1087+
],
1088+
"window_display": false
10471089
}
10481090
},
10491091
"nbformat": 4,

docs/examples/DataSet/DataSet-class-walkthrough.ipynb

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"source": [
4949
"## Preparation: a DataSet from a dummy Measurement\n",
5050
"\n",
51-
"In order to obtain a `DataSet` object, we are going to run a `Measurement` storing some dummy data (see [Dataset Context Manager](Dataset%20Context%20Manager.ipynb) notebook for more details)."
51+
"In order to obtain a `DataSet` object, we are going to run a `Measurement` storing some dummy data (see notebook on [Performing measurements using qcodes parameters and dataset](Performing-measurements-using-qcodes-parameters-and-dataset.ipynb) for more details)."
5252
]
5353
},
5454
{
@@ -1340,7 +1340,49 @@
13401340
"name": "python",
13411341
"nbconvert_exporter": "python",
13421342
"pygments_lexer": "ipython3",
1343-
"version": "3.7.4"
1343+
"version": "3.7.5"
1344+
},
1345+
"toc": {
1346+
"base_numbering": 1,
1347+
"nav_menu": {},
1348+
"number_sections": true,
1349+
"sideBar": true,
1350+
"skip_h1_title": false,
1351+
"title_cell": "Table of Contents",
1352+
"title_sidebar": "Contents",
1353+
"toc_cell": false,
1354+
"toc_position": {},
1355+
"toc_section_display": true,
1356+
"toc_window_display": false
1357+
},
1358+
"varInspector": {
1359+
"cols": {
1360+
"lenName": 16,
1361+
"lenType": 16,
1362+
"lenVar": 40
1363+
},
1364+
"kernels_config": {
1365+
"python": {
1366+
"delete_cmd_postfix": "",
1367+
"delete_cmd_prefix": "del ",
1368+
"library": "var_list.py",
1369+
"varRefreshCmd": "print(var_dic_list())"
1370+
},
1371+
"r": {
1372+
"delete_cmd_postfix": ") ",
1373+
"delete_cmd_prefix": "rm(",
1374+
"library": "var_list.r",
1375+
"varRefreshCmd": "cat(var_dic_list()) "
1376+
}
1377+
},
1378+
"types_to_exclude": [
1379+
"module",
1380+
"function",
1381+
"builtin_function_or_method",
1382+
"instance",
1383+
"_Feature"
1384+
],
1385+
"window_display": false
13441386
}
13451387
},
13461388
"nbformat": 4,

0 commit comments

Comments
 (0)