Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature : allow users to link runs #1639

Merged
merged 27 commits into from
Jul 24, 2019
Merged

Feature : allow users to link runs #1639

merged 27 commits into from
Jul 24, 2019

Conversation

WilliamHPNielsen
Copy link
Contributor

@WilliamHPNielsen WilliamHPNielsen commented Jul 23, 2019 •
edited

This PR supersedes #1615

I need to

  • Take care of merge conflict resolving fallout :P
  • Make the version 7 -> 8 upgrader populate the parent_datasets column with the default value "[]" No reason for this, since we've agreed to treat that column as optional
  • Update the "generate-fixture-dbs" repo with some version 7 DBs
  • Use those DBs in CI for this branch

and then we should be ready to merge.

@QCoDeS/core

@WilliamHPNielsen
Add Link dataclass
ec0acba
@WilliamHPNielsen
Add functions to convert between Links and strings
e8fa5e8
@WilliamHPNielsen
Sort test imports
28edc11
@WilliamHPNielsen
Add db_upgrade for version 6 to 7
8e7655c 
This schema upgrade adds a column "parent_datasets" to the runs table
@WilliamHPNielsen
Sort data_set imports
6df4c7b
@WilliamHPNielsen
Add methods to dump and load lists of links
e011911
@WilliamHPNielsen
Add query funcs to get and update parent_datasets
c601d81
@WilliamHPNielsen
Add parent_dataset_links property to DataSet
95e8b68
@WilliamHPNielsen
Add linking features to the Measurement
22539ba
@WilliamHPNielsen
Add half-finished notebook
a672bff
@WilliamHPNielsen
Complete the curve fitting example in notebook
602c1fe
@WilliamHPNielsen
Correct docstring "Edge" -> "Link"
eb9482e
@WilliamHPNielsen
Use dataclasses.asdict instead of homemade func
65bf8eb
@WilliamHPNielsen
Make validate_node a static method
ab74432
@WilliamHPNielsen
Remove unused variable
59219dd
@WilliamHPNielsen
Prepare for merging (bump db upgrade num)
50fcb19
@WilliamHPNielsen
Merge branch 'db_upgrades' into feature/linked_runs_A
174f377
@WilliamHPNielsen WilliamHPNielsen mentioned this pull request Jul 23, 2019
Closed
@WilliamHPNielsen
Clean up after merge
7f49ec5 
I admit it: I am very bad at resolving merge conflicts.
This commit cleans up after the previous merge commit
@WilliamHPNielsen
Make the parent_datasets column optional
7e3ae3f 
From the viewpoint of the queries.
@WilliamHPNielsen
Fix typo in test
52221ee
@WilliamHPNielsen
Generate v7 DBs in CI
0e66239
@WilliamHPNielsen WilliamHPNielsen marked this pull request as ready for review July 24, 2019 09:04
jenshnielsen
jenshnielsen approved these changes Jul 24, 2019
View reviewed changes
Copy link
Collaborator

@jenshnielsen jenshnielsen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it looks sensible. I left a few suggestions and questions inside

qcodes/dataset/linked_datasets/links.py Outdated Show resolved Hide resolved
qcodes/dataset/measurements.py Show resolved Hide resolved
qcodes/dataset/sqlite/queries.py Show resolved Hide resolved
@WilliamHPNielsen WilliamHPNielsen merged commit 210ab32 into microsoft:db_upgrades Jul 24, 2019
@WilliamHPNielsen WilliamHPNielsen mentioned this pull request Jul 24, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jenshnielsen jenshnielsen jenshnielsen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@WilliamHPNielsen @jenshnielsen