Skip to content

Commit

Permalink
Merge branch 'master' into prevent_save_config_to_home
Browse files Browse the repository at this point in the history
  • Loading branch information
jenshnielsen authored Jun 8, 2020
2 parents 3a47110 + 2fb0870 commit 0dab952
Show file tree
Hide file tree
Showing 44 changed files with 3,038 additions and 769 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
qcodes/_version.py export-subst
* text=auto eol=lf
*.{cmd,[cC][mM][dD]} text eol=crlf
*.{bat,[bB][aA][tT]} text eol=crlf
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ script:
python generate_version_5.py
python generate_version_6.py
python generate_version_7.py
python generate_version_8.py
cd $TRAVIS_BUILD_DIR
pip uninstall -y qcodes
pip install .
Expand Down
3 changes: 2 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ jobs:
python generate_version_4.py &&
python generate_version_5.py &&
python generate_version_6.py &&
python generate_version_7.py
python generate_version_7.py &&
python generate_version_8.py
displayName: "Generate db fixtures"
condition: succeededOrFailed()
- bash: |
Expand Down
31 changes: 31 additions & 0 deletions docs/changes/0.15.0.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Changelog for QCoDeS 0.15.0 (Unreleased)
========================================

The June 2020 release of QCoDeS

Breaking Changes:
_________________

* ``GroupParameter.group``, ``Group.parameters`` and ``Group.instrument`` are now
all read only properties (#2031).
* The public attributes ``Group.get_cmd`` and `Group.get_cmd`` have
been removed (#2031).


Improved drivers:
_________________


Improved:
_________

* GroupParameter now correctly update their cache when a single parameter in
the group has been set or captured (#2031)
* GroupParameter now correctly implements mappings between
``value`` and ``raw_value`` e.g. ``scale`` and ``offset`` (#2031)



Under the hood:
_______________

1 change: 1 addition & 0 deletions docs/changes/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ Changelogs
0.12.1 <0.12.1>
0.13.0 <0.13.0>
0.14.0 <0.14.0>
0.15.0 <0.15.0>
Loading

0 comments on commit 0dab952

Please sign in to comment.