From cf80d36256ca82279dbadbd2cd3049b9fc3b6653 Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Wed, 20 May 2020 15:42:06 +0200 Subject: [PATCH 01/20] Remove save_to_home in db_creation_upgrading --- qcodes/tests/dataset/test_database_creation_and_upgrading.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/qcodes/tests/dataset/test_database_creation_and_upgrading.py b/qcodes/tests/dataset/test_database_creation_and_upgrading.py index 0908cf31ad4..5923ba7308a 100644 --- a/qcodes/tests/dataset/test_database_creation_and_upgrading.py +++ b/qcodes/tests/dataset/test_database_creation_and_upgrading.py @@ -52,15 +52,12 @@ def location_and_station_set_to(location: int, work_station: int): old_cfg = deepcopy(cfg.current_config) cfg['GUID_components']['location'] = location cfg['GUID_components']['work_station'] = work_station - cfg.save_to_home() try: yield finally: cfg.current_config = old_cfg - cfg.save_to_home() - LATEST_VERSION = _latest_available_version() VERSIONS = tuple(range(LATEST_VERSION + 1)) From 0c58d86b50514c150fe1ef5e428d44cc44ce1cc4 Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Wed, 20 May 2020 15:43:20 +0200 Subject: [PATCH 02/20] Remove unused imports --- qcodes/tests/dataset/test_database_creation_and_upgrading.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/qcodes/tests/dataset/test_database_creation_and_upgrading.py b/qcodes/tests/dataset/test_database_creation_and_upgrading.py index 5923ba7308a..1f94b566121 100644 --- a/qcodes/tests/dataset/test_database_creation_and_upgrading.py +++ b/qcodes/tests/dataset/test_database_creation_and_upgrading.py @@ -19,7 +19,6 @@ from qcodes.dataset.sqlite.database import ( connect, get_db_version_and_newest_available_version, initialise_database, initialise_or_create_database_at) -# pylint: disable=unused-import from qcodes.dataset.sqlite.db_upgrades import (_latest_available_version, get_user_version, perform_db_upgrade_0_to_1, @@ -36,9 +35,7 @@ from qcodes.dataset.sqlite.queries import get_run_description, update_GUIDs from qcodes.dataset.sqlite.query_helpers import is_column_in_table, one from qcodes.tests.common import error_caused_by -from qcodes.tests.dataset.temporary_databases import (empty_temp_db, - experiment, - temporarily_copied_DB) +from qcodes.tests.dataset.temporary_databases import temporarily_copied_DB from qcodes.dataset.data_set import ( load_by_counter, load_by_id, load_by_run_spec) From 7b60aa1eb28a134623f57218a64be646e50a95ef Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Wed, 20 May 2020 15:49:20 +0200 Subject: [PATCH 03/20] Remove save_to_home in test_guids --- qcodes/tests/dataset/test_guids.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/qcodes/tests/dataset/test_guids.py b/qcodes/tests/dataset/test_guids.py index 14c791c6d55..9425d9d00ea 100644 --- a/qcodes/tests/dataset/test_guids.py +++ b/qcodes/tests/dataset/test_guids.py @@ -29,7 +29,6 @@ def protected_config(): finally: cfg = Config() cfg.current_config = original_config - cfg.save_to_home() @settings(max_examples=50, deadline=1000) @@ -42,7 +41,6 @@ def test_generate_guid(loc, stat, smpl): cfg['GUID_components']['location'] = loc cfg['GUID_components']['work_station'] = stat cfg['GUID_components']['sample'] = smpl - cfg.save_to_home() guid = generate_guid() gen_time = int(np.round(time.time()*1000)) @@ -109,7 +107,6 @@ def make_test_guid(cfg, loc: int, smpl: int, stat: int): cfg['GUID_components']['location'] = loc cfg['GUID_components']['work_station'] = stat cfg['GUID_components']['sample'] = smpl - cfg.save_to_home() guid = generate_guid() gen_time = int(np.round(time.time() * 1000)) From f77fa65ababbd2f36220ee311dd9ae1c12d6ca59 Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Wed, 20 May 2020 15:52:05 +0200 Subject: [PATCH 04/20] Fix long lines --- qcodes/tests/dataset/test_guids.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qcodes/tests/dataset/test_guids.py b/qcodes/tests/dataset/test_guids.py index 9425d9d00ea..ce957c6cfff 100644 --- a/qcodes/tests/dataset/test_guids.py +++ b/qcodes/tests/dataset/test_guids.py @@ -97,9 +97,12 @@ def test_set_guid_workstatio_code(ws, monkeypatch): @settings(max_examples=50, deadline=1000) -@given(locs=hst.lists(hst.integers(0, 255), min_size=2, max_size=2, unique=True), - stats=hst.lists(hst.integers(0, 65535), min_size=2, max_size=2, unique=True), - smpls=hst.lists(hst.integers(0, 4294967295), min_size=2, max_size=2, unique=True), +@given(locs=hst.lists(hst.integers(0, 255), min_size=2, max_size=2, + unique=True), + stats=hst.lists(hst.integers(0, 65535), min_size=2, max_size=2, + unique=True), + smpls=hst.lists(hst.integers(0, 4294967295), min_size=2, max_size=2, + unique=True), ) def test_filter_guid(locs, stats, smpls): From 9123bfcbf11e6aa20e53c7a5f9b609b4470ffdd3 Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Wed, 20 May 2020 16:19:54 +0200 Subject: [PATCH 05/20] Restore imports --- qcodes/tests/dataset/test_database_creation_and_upgrading.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcodes/tests/dataset/test_database_creation_and_upgrading.py b/qcodes/tests/dataset/test_database_creation_and_upgrading.py index 1f94b566121..5923ba7308a 100644 --- a/qcodes/tests/dataset/test_database_creation_and_upgrading.py +++ b/qcodes/tests/dataset/test_database_creation_and_upgrading.py @@ -19,6 +19,7 @@ from qcodes.dataset.sqlite.database import ( connect, get_db_version_and_newest_available_version, initialise_database, initialise_or_create_database_at) +# pylint: disable=unused-import from qcodes.dataset.sqlite.db_upgrades import (_latest_available_version, get_user_version, perform_db_upgrade_0_to_1, @@ -35,7 +36,9 @@ from qcodes.dataset.sqlite.queries import get_run_description, update_GUIDs from qcodes.dataset.sqlite.query_helpers import is_column_in_table, one from qcodes.tests.common import error_caused_by -from qcodes.tests.dataset.temporary_databases import temporarily_copied_DB +from qcodes.tests.dataset.temporary_databases import (empty_temp_db, + experiment, + temporarily_copied_DB) from qcodes.dataset.data_set import ( load_by_counter, load_by_id, load_by_run_spec) From 930108c38cc7797e08a53ec74251fb3454b9239d Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Wed, 3 Jun 2020 20:24:56 +0200 Subject: [PATCH 06/20] Use in memory config --- qcodes/tests/dataset/test_database_creation_and_upgrading.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/qcodes/tests/dataset/test_database_creation_and_upgrading.py b/qcodes/tests/dataset/test_database_creation_and_upgrading.py index 5923ba7308a..135f4889db8 100644 --- a/qcodes/tests/dataset/test_database_creation_and_upgrading.py +++ b/qcodes/tests/dataset/test_database_creation_and_upgrading.py @@ -9,7 +9,6 @@ import qcodes as qc import qcodes.dataset.descriptions.versioning.serialization as serial import qcodes.tests.dataset -from qcodes.configuration import Config from qcodes import new_data_set, new_experiment from qcodes.dataset.descriptions.dependencies import InterDependencies_ from qcodes.dataset.descriptions.param_spec import ParamSpecBase @@ -48,8 +47,8 @@ @contextmanager def location_and_station_set_to(location: int, work_station: int): - cfg = Config() - old_cfg = deepcopy(cfg.current_config) + cfg = qc.config + old_cfg = deepcopy(cfg) cfg['GUID_components']['location'] = location cfg['GUID_components']['work_station'] = work_station From 7813e7b87d78027c0abc4228c219192b0ac2c5fa Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Thu, 4 Jun 2020 16:07:49 +0200 Subject: [PATCH 07/20] Fix config calls where it is possible --- qcodes/dataset/guids.py | 8 ++++---- .../dataset/test_database_extract_runs.py | 4 ++-- qcodes/tests/dataset/test_guids.py | 20 +++++++++---------- qcodes/tests/test_config.py | 12 +++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/qcodes/dataset/guids.py b/qcodes/dataset/guids.py index 65ed415fc18..7830cbf3991 100644 --- a/qcodes/dataset/guids.py +++ b/qcodes/dataset/guids.py @@ -4,7 +4,7 @@ import numpy as np -from qcodes.configuration import Config +import qcodes as qc _guid_pattern = re.compile(r'^[\da-f]{8}-([\da-f]{4}-){3}[\da-f]{12}$') @@ -25,7 +25,7 @@ def generate_guid(timeint: Union[int, None]=None, timeint: An integer of miliseconds since unix epoch time sampleint: A code for the sample """ - cfg = Config() + cfg = qc.config try: guid_comp = cfg['GUID_components'] @@ -81,7 +81,7 @@ def set_guid_location_code() -> None: """ Interactive function to set the location code. """ - cfg = Config() + cfg = qc.config old_loc = cfg['GUID_components']['location'] print(f'Updating GUID location code. Current location code is: {old_loc}') if old_loc != 0: @@ -106,7 +106,7 @@ def set_guid_work_station_code() -> None: """ Interactive function to set the work station code """ - cfg = Config() + cfg = qc.config old_ws = cfg['GUID_components']['work_station'] print('Updating GUID work station code. ' f'Current work station code is: {old_ws}') diff --git a/qcodes/tests/dataset/test_database_extract_runs.py b/qcodes/tests/dataset/test_database_extract_runs.py index c7406334a78..e891b1b853e 100644 --- a/qcodes/tests/dataset/test_database_extract_runs.py +++ b/qcodes/tests/dataset/test_database_extract_runs.py @@ -9,7 +9,7 @@ import pytest import numpy as np -from qcodes.configuration import Config +import qcodes as qc import qcodes.tests.dataset from qcodes.dataset.experiment_container import Experiment,\ load_experiment_by_name @@ -511,7 +511,7 @@ def test_combine_runs(two_empty_temp_db_connections, lines = table.split('\n') headers = re.split(r'\s+', lines[0].strip()) - cfg = Config() + cfg = qc.config guid_comp = cfg['GUID_components'] # borrowed fallback logic from generate_guid diff --git a/qcodes/tests/dataset/test_guids.py b/qcodes/tests/dataset/test_guids.py index ce957c6cfff..e4d26e2b2af 100644 --- a/qcodes/tests/dataset/test_guids.py +++ b/qcodes/tests/dataset/test_guids.py @@ -8,12 +8,13 @@ import hypothesis.strategies as hst import numpy as np +import qcodes as qc from qcodes.dataset.guids import (generate_guid, parse_guid, set_guid_location_code, set_guid_work_station_code, validate_guid_format, filter_guids_by_parts) -from qcodes.configuration import Config, DotDict +from qcodes.configuration import DotDict @contextmanager def protected_config(): @@ -21,14 +22,13 @@ def protected_config(): Context manager to be used in all tests that modify the config to ensure that the config is left untouched even if the tests fail """ - ocfg: DotDict = Config().current_config + ocfg: DotDict = qc.config.current_config original_config = deepcopy(ocfg) try: yield finally: - cfg = Config() - cfg.current_config = original_config + qc.config.current_config = original_config @settings(max_examples=50, deadline=1000) @@ -37,7 +37,7 @@ def protected_config(): def test_generate_guid(loc, stat, smpl): # update config to generate a particular guid. Read it back to verify with protected_config(): - cfg = Config() + cfg = qc.config cfg['GUID_components']['location'] = loc cfg['GUID_components']['work_station'] = stat cfg['GUID_components']['sample'] = smpl @@ -61,14 +61,14 @@ def test_generate_guid(loc, stat, smpl): def test_set_guid_location_code(loc, monkeypatch): monkeypatch.setattr('builtins.input', lambda x: str(loc)) - orig_cfg = Config().current_config + orig_cfg = qc.config original_loc = orig_cfg['GUID_components']['location'] with protected_config(): set_guid_location_code() - cfg = Config().current_config + cfg = qc.config if 257 > loc > 0: assert cfg['GUID_components']['location'] == loc @@ -81,14 +81,14 @@ def test_set_guid_location_code(loc, monkeypatch): def test_set_guid_workstatio_code(ws, monkeypatch): monkeypatch.setattr('builtins.input', lambda x: str(ws)) - orig_cfg = Config().current_config + orig_cfg = qc.config original_ws = orig_cfg['GUID_components']['work_station'] with protected_config(): set_guid_work_station_code() - cfg = Config().current_config + cfg = qc.config if 16777216 > ws > 0: assert cfg['GUID_components']['work_station'] == ws @@ -126,7 +126,7 @@ def make_test_guid(cfg, loc: int, smpl: int, stat: int): with protected_config(): guids = [] - cfg = Config() + cfg = qc.config corrected_smpls = [smpl if smpl != 0 else int('a' * 8, base=16) for smpl in smpls] diff --git a/qcodes/tests/test_config.py b/qcodes/tests/test_config.py index 7ce1071c26f..47cabbcbf77 100644 --- a/qcodes/tests/test_config.py +++ b/qcodes/tests/test_config.py @@ -14,7 +14,7 @@ import tempfile import qcodes -from qcodes.configuration import Config +from qcodes.configuration import Config, DotDict VALID_JSON = "{}" ENV_KEY = "/dev/random" @@ -173,7 +173,7 @@ def default_config(user_config: Optional[str] = None): Config.cwd_file_name = '' Config.schema_cwd_file_name = '' - default_config_obj = copy.deepcopy(qcodes.config) + default_config_obj: DotDict = copy.deepcopy(qcodes.config.current_config) qcodes.config = Config() try: @@ -186,7 +186,7 @@ def default_config(user_config: Optional[str] = None): Config.cwd_file_name = cwd_file_name Config.schema_cwd_file_name = schema_cwd_file_name - qcodes.config = default_config_obj + qcodes.config.current_config = default_config_obj def side_effect(map, name): @@ -319,7 +319,7 @@ def test_update_and_validate_user_config(self, config, schema): def test_update_from_path(path_to_config_file_on_disk): with default_config(): - cfg = Config() + cfg = qcodes.config # check that the default is still the default assert cfg["core"]["db_debug"] is False @@ -338,7 +338,7 @@ def test_update_from_path(path_to_config_file_on_disk): def test_repr(): - cfg = Config() + cfg = qcodes.config rep = cfg.__repr__() expected_rep = (f"Current values: \n {cfg.current_config} \n" @@ -360,7 +360,7 @@ def test_add_and_describe(): description ='A test' default = 'testdefault' - cfg = Config() + cfg = qcodes.config cfg.add(key=key, value=value, value_type=value_type, description=description, default=default) From 1451fe7b34d946a6c1c7955f8d82cd3a21b1f2e0 Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Thu, 4 Jun 2020 16:19:20 +0200 Subject: [PATCH 08/20] Fix long line --- qcodes/tests/test_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qcodes/tests/test_config.py b/qcodes/tests/test_config.py index 47cabbcbf77..8c1897e8efa 100644 --- a/qcodes/tests/test_config.py +++ b/qcodes/tests/test_config.py @@ -173,7 +173,8 @@ def default_config(user_config: Optional[str] = None): Config.cwd_file_name = '' Config.schema_cwd_file_name = '' - default_config_obj: DotDict = copy.deepcopy(qcodes.config.current_config) + default_config_obj: DotDict = copy.\ + deepcopy(qcodes.config.current_config) qcodes.config = Config() try: From 01159d8806d51f34535735b43ce06b1b4fedc376 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 8 Jun 2020 09:36:42 +0200 Subject: [PATCH 09/20] correct types of dotdict --- qcodes/configuration/config.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qcodes/configuration/config.py b/qcodes/configuration/config.py index da7136f9077..fec12f1792e 100644 --- a/qcodes/configuration/config.py +++ b/qcodes/configuration/config.py @@ -70,14 +70,14 @@ class Config: schema_file_name) """Filename of cwd schema""" - current_schema: Optional[dict] = None + current_schema: Optional['DotDict'] = None """Validators and descriptions of config values""" - current_config: Optional[dict] = None + current_config: Optional['DotDict'] = None """Valid config values""" - defaults: dict + defaults: 'DotDict' """The default configuration""" - defaults_schema: dict + defaults_schema: 'DotDict' """The default schema""" _diff_config: Dict[str, Any] = {} @@ -93,7 +93,7 @@ def __init__(self, path: Optional[str] = None) -> None: self.defaults, self.defaults_schema = self.load_default() self.update_config() - def load_default(self) -> Tuple[dict, dict]: + def load_default(self) -> Tuple['DotDict', 'DotDict']: defaults = self.load_config(self.default_file_name) defaults_schema = self.load_config(self.schema_default_file_name) self.validate(defaults, defaults_schema) From fb7e034b9f61b2c4960aab3574bc6091e87d53f5 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 8 Jun 2020 09:41:18 +0200 Subject: [PATCH 10/20] this can be optional --- qcodes/tests/test_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcodes/tests/test_config.py b/qcodes/tests/test_config.py index 8c1897e8efa..626e796a76f 100644 --- a/qcodes/tests/test_config.py +++ b/qcodes/tests/test_config.py @@ -173,7 +173,7 @@ def default_config(user_config: Optional[str] = None): Config.cwd_file_name = '' Config.schema_cwd_file_name = '' - default_config_obj: DotDict = copy.\ + default_config_obj: Optional[DotDict] = copy.\ deepcopy(qcodes.config.current_config) qcodes.config = Config() From c2fa7a905a821df11f8c65abc41f3376735ad18c Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 8 Jun 2020 09:48:39 +0200 Subject: [PATCH 11/20] fix context manager previous version would overwrite the config class with the dict internal to the config class :( --- qcodes/tests/dataset/test_database_creation_and_upgrading.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qcodes/tests/dataset/test_database_creation_and_upgrading.py b/qcodes/tests/dataset/test_database_creation_and_upgrading.py index 135f4889db8..4f5d00c0c41 100644 --- a/qcodes/tests/dataset/test_database_creation_and_upgrading.py +++ b/qcodes/tests/dataset/test_database_creation_and_upgrading.py @@ -47,7 +47,7 @@ @contextmanager def location_and_station_set_to(location: int, work_station: int): - cfg = qc.config + cfg = qc.config.current_config old_cfg = deepcopy(cfg) cfg['GUID_components']['location'] = location cfg['GUID_components']['work_station'] = work_station @@ -56,7 +56,7 @@ def location_and_station_set_to(location: int, work_station: int): yield finally: - cfg.current_config = old_cfg + qc.config.current_config = old_cfg LATEST_VERSION = _latest_available_version() VERSIONS = tuple(range(LATEST_VERSION + 1)) From c8cdb6edd74db10f8aa42f3f8f7b82b9c14f054c Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 8 Jun 2020 11:05:47 +0200 Subject: [PATCH 12/20] simplify assert and do it for all datasets --- .../test_database_creation_and_upgrading.py | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/qcodes/tests/dataset/test_database_creation_and_upgrading.py b/qcodes/tests/dataset/test_database_creation_and_upgrading.py index 4f5d00c0c41..c6d9e9d6c34 100644 --- a/qcodes/tests/dataset/test_database_creation_and_upgrading.py +++ b/qcodes/tests/dataset/test_database_creation_and_upgrading.py @@ -570,13 +570,8 @@ def test_update_existing_guids(caplog): ds2.mark_started() ds2.add_results([{'x': 2}]) - guid_comps_1 = parse_guid(ds1.guid) - assert guid_comps_1['location'] == 0 - assert guid_comps_1['work_station'] == 0 - - guid_comps_2 = parse_guid(ds2.guid) - assert guid_comps_2['location'] == 0 - assert guid_comps_2['work_station'] == 0 + _assert_loc_station(ds1, 0, 0) + _assert_loc_station(ds2, 0, 0) with location_and_station_set_to(0, old_ws): ds3 = new_data_set('ds_three') @@ -584,18 +579,24 @@ def test_update_existing_guids(caplog): ds3.mark_started() ds3.add_results([{'x': 3}]) + _assert_loc_station(ds3, 0, old_ws) + with location_and_station_set_to(old_loc, 0): ds4 = new_data_set('ds_four') ds4.set_interdependencies(idps) ds4.mark_started() ds4.add_results([{'x': 4}]) + _assert_loc_station(ds4, old_loc, 0) + with location_and_station_set_to(old_loc, old_ws): ds5 = new_data_set('ds_five') ds5.set_interdependencies(idps) ds5.mark_started() ds5.add_results([{'x': 5}]) + _assert_loc_station(ds5, old_loc, old_ws) + with location_and_station_set_to(new_loc, new_ws): caplog.clear() @@ -612,25 +613,17 @@ def test_update_existing_guids(caplog): for record, lvl in zip(caplog.records, expected_levels): assert record.levelname == lvl - guid_comps_1 = parse_guid(ds1.guid) - assert guid_comps_1['location'] == new_loc - assert guid_comps_1['work_station'] == new_ws - - guid_comps_2 = parse_guid(ds2.guid) - assert guid_comps_2['location'] == new_loc - assert guid_comps_2['work_station'] == new_ws - - guid_comps_3 = parse_guid(ds3.guid) - assert guid_comps_3['location'] == 0 - assert guid_comps_3['work_station'] == old_ws + _assert_loc_station(ds1, new_loc, new_ws) + _assert_loc_station(ds2, new_loc, new_ws) + _assert_loc_station(ds3, 0, old_ws) + _assert_loc_station(ds4, old_loc, 0) + _assert_loc_station(ds5, old_loc, old_ws) - guid_comps_4 = parse_guid(ds4.guid) - assert guid_comps_4['location'] == old_loc - assert guid_comps_4['work_station'] == 0 - guid_comps_5 = parse_guid(ds5.guid) - assert guid_comps_5['location'] == old_loc - assert guid_comps_5['work_station'] == old_ws +def _assert_loc_station(ds, expected_loc, expected_station): + guid_dict = parse_guid(ds.guid) + assert guid_dict["location"] == expected_loc + assert guid_dict["work_station"] == expected_station @pytest.mark.parametrize('db_file', From d5e06c8b8313c72d22501ea8bc38bc7488f35b9e Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Sat, 6 Jun 2020 06:16:00 +0200 Subject: [PATCH 13/20] Temporary change in travis to see full error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 66fbb2a178f..3a8ca38b4c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,7 @@ script: pip uninstall -y qcodes pip install . - cd qcodes + - pytest .\qcodes\tests\dataset\test_database_creation_and_upgrading.py -s - py.test --cov=qcodes --cov-report xml --cov-config=.coveragerc - cd .. - mypy qcodes @@ -100,4 +101,3 @@ after_success: - cd $TRAVIS_BUILD_DIR - python-codacy-coverage -r qcodes/coverage.xml - codecov - From 8db925fd41c9169df619931f38becf935cbb989e Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Sat, 6 Jun 2020 06:20:55 +0200 Subject: [PATCH 14/20] Fix the path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a8ca38b4c8..9c0a9e1cfb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,7 +70,7 @@ script: pip uninstall -y qcodes pip install . - cd qcodes - - pytest .\qcodes\tests\dataset\test_database_creation_and_upgrading.py -s + - pytest \tests\dataset\test_database_creation_and_upgrading.py -s - py.test --cov=qcodes --cov-report xml --cov-config=.coveragerc - cd .. - mypy qcodes From b9a5870036dae358c20df295a69e88a57760d475 Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Sat, 6 Jun 2020 06:25:51 +0200 Subject: [PATCH 15/20] Add crude debugging --- qcodes/tests/dataset/test_database_creation_and_upgrading.py | 1 + 1 file changed, 1 insertion(+) diff --git a/qcodes/tests/dataset/test_database_creation_and_upgrading.py b/qcodes/tests/dataset/test_database_creation_and_upgrading.py index c6d9e9d6c34..0c8abe28d4d 100644 --- a/qcodes/tests/dataset/test_database_creation_and_upgrading.py +++ b/qcodes/tests/dataset/test_database_creation_and_upgrading.py @@ -611,6 +611,7 @@ def test_update_existing_guids(caplog): update_GUIDs(ds1.conn) for record, lvl in zip(caplog.records, expected_levels): + print(record) assert record.levelname == lvl _assert_loc_station(ds1, new_loc, new_ws) From 2ecf79002d02bba2c3b1d7fe43fb1ec04ff1766d Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Sat, 6 Jun 2020 07:12:44 +0200 Subject: [PATCH 16/20] Correct path --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c0a9e1cfb5..517b2d151dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,8 +69,9 @@ script: cd $TRAVIS_BUILD_DIR pip uninstall -y qcodes pip install . - - cd qcodes - - pytest \tests\dataset\test_database_creation_and_upgrading.py -s + - cd qcodes/tests/dataset + - pytest test_database_creation_and_upgrading.py -s + - cd ../.. - py.test --cov=qcodes --cov-report xml --cov-config=.coveragerc - cd .. - mypy qcodes From 079a40bec87f267c7bc49adddb5d137daa00edb2 Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Sat, 6 Jun 2020 07:59:39 +0200 Subject: [PATCH 17/20] Remove Config() call from queries --- qcodes/dataset/sqlite/queries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcodes/dataset/sqlite/queries.py b/qcodes/dataset/sqlite/queries.py index 9f25df51a92..d476a57033d 100644 --- a/qcodes/dataset/sqlite/queries.py +++ b/qcodes/dataset/sqlite/queries.py @@ -1593,7 +1593,7 @@ def update_GUIDs(conn: ConnectionPlus) -> None: log.info('Commencing update of all GUIDs in database') - cfg = Config() + cfg = qc.config.current_config location = cfg['GUID_components']['location'] work_station = cfg['GUID_components']['work_station'] From 83eb8f3e44ff4a0e3a43b0c827bb0895e49b9f5e Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Sat, 6 Jun 2020 08:58:00 +0200 Subject: [PATCH 18/20] Fix mypy --- qcodes/dataset/sqlite/queries.py | 5 ++++- qcodes/tests/dataset/test_database_creation_and_upgrading.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/qcodes/dataset/sqlite/queries.py b/qcodes/dataset/sqlite/queries.py index d476a57033d..2271290c1f3 100644 --- a/qcodes/dataset/sqlite/queries.py +++ b/qcodes/dataset/sqlite/queries.py @@ -1593,7 +1593,10 @@ def update_GUIDs(conn: ConnectionPlus) -> None: log.info('Commencing update of all GUIDs in database') - cfg = qc.config.current_config + cfg = qc.config + + if cfg is None: + raise RuntimeError("expected cfg to be not None") location = cfg['GUID_components']['location'] work_station = cfg['GUID_components']['work_station'] diff --git a/qcodes/tests/dataset/test_database_creation_and_upgrading.py b/qcodes/tests/dataset/test_database_creation_and_upgrading.py index 0c8abe28d4d..9f87c169bdf 100644 --- a/qcodes/tests/dataset/test_database_creation_and_upgrading.py +++ b/qcodes/tests/dataset/test_database_creation_and_upgrading.py @@ -48,6 +48,8 @@ @contextmanager def location_and_station_set_to(location: int, work_station: int): cfg = qc.config.current_config + if cfg is None: + raise RuntimeError("Expected config to be not None.") old_cfg = deepcopy(cfg) cfg['GUID_components']['location'] = location cfg['GUID_components']['work_station'] = work_station From 195aa7458c6b0f5f629a374345fddf938153d1b3 Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Sat, 6 Jun 2020 09:04:29 +0200 Subject: [PATCH 19/20] Reverse back travis.yml --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 517b2d151dc..7a8ba38c96c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,9 +69,7 @@ script: cd $TRAVIS_BUILD_DIR pip uninstall -y qcodes pip install . - - cd qcodes/tests/dataset - - pytest test_database_creation_and_upgrading.py -s - - cd ../.. + - cd qcodes - py.test --cov=qcodes --cov-report xml --cov-config=.coveragerc - cd .. - mypy qcodes From 3a4711072597e6bcee6fba8c48849585ec780468 Mon Sep 17 00:00:00 2001 From: AUC Hardal Date: Sat, 6 Jun 2020 09:14:48 +0200 Subject: [PATCH 20/20] Remove unnecessary non check --- qcodes/dataset/sqlite/queries.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/qcodes/dataset/sqlite/queries.py b/qcodes/dataset/sqlite/queries.py index 2271290c1f3..bbdbd507f6d 100644 --- a/qcodes/dataset/sqlite/queries.py +++ b/qcodes/dataset/sqlite/queries.py @@ -1595,9 +1595,6 @@ def update_GUIDs(conn: ConnectionPlus) -> None: cfg = qc.config - if cfg is None: - raise RuntimeError("expected cfg to be not None") - location = cfg['GUID_components']['location'] work_station = cfg['GUID_components']['work_station']