Skip to content

Resolves #52 #53

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
Merged
merged 1 commit into from
Jun 16, 2020
Merged

Resolves #52 #53

merged 1 commit into from
Jun 16, 2020

Conversation

rpanderson
Copy link
Member

experiment_name keyword renamed to apparatus_name in labconfig. Existing config files with the old name will be permitted and:

  • Value of experiment_name mapped to apparatus_name.
  • FutureWarning issued.
  • Exception raised if both experiment_name and apparatus_name exist in labconfig.

rpanderson added a commit to rpanderson/blacs that referenced this pull request Jun 10, 2020
@rpanderson
experiment_name changed to apparatus_name
1d1e9c4 
Per labscript-suite/labscript-utils#53
rpanderson added a commit to rpanderson/runmanager that referenced this pull request Jun 10, 2020
@rpanderson
experiment_name changed to apparatus_name
a1e2462 
Per labscript-suite/labscript-utils#53
rpanderson added a commit to rpanderson/runviewer that referenced this pull request Jun 10, 2020
@rpanderson
experiment_name changed to apparatus_name
9487469 
Per labscript-suite/labscript-utils#53
rpanderson added a commit to rpanderson/lyse that referenced this pull request Jun 10, 2020
@rpanderson
experiment_name changed to apparatus_name
84c6ec7 
Per labscript-suite/labscript-utils#53
This was referenced Jun 10, 2020
Merged
Merged
Merged
Merged
rpanderson added a commit to rpanderson/labscript-suite that referenced this pull request Jun 10, 2020
@rpanderson
experiment_name changed to apparatus_name
209a156 
Per labscript-suite/labscript-utils#53
This was referenced Jun 10, 2020
Merged
Merged
rpanderson added a commit to rpanderson/labscript-suite that referenced this pull request Jun 15, 2020
@rpanderson
experiment_name changed to apparatus_name
ca44f18 
Per labscript-suite/labscript-utils#53
@rpanderson rpanderson linked an issue Jun 15, 2020 that may be closed by this pull request
Change experiment_name to apparatus_name in labconfig #52
Closed
@rpanderson rpanderson merged commit b312180 into labscript-suite:master Jun 16, 2020
@rpanderson rpanderson deleted the apparatus_name branch June 16, 2020 02:05
philipstarkey added a commit to labscript-suite/runmanager that referenced this pull request Jun 25, 2020
@philipstarkey @chrisjbillington @rpanderson
Squashed commit of the following:
61be21f 
commit 6868c8e
Author: Phil Starkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 25 18:43:47 2020 +1000

    Update dependencies in setup.cfg

    Bumped labscript and labscript_utils versions to `>=3.0.0`

commit be2dc40
Merge: 6a7d105 80f272e
Author: Phil Starkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 25 12:17:20 2020 +1000

    Merge pull request #95 from chrisjbillington:use-runviewer-launcher

    Fix issue #92

commit 80f272e
Author: chrisjbillington <chrisjbillington@gmail.com>
Date:   Wed Jun 24 20:45:17 2020 -0400

    Fix issue #92

    Launch runviewer using the runviewer-gui launcher, for consistency with
    how it would be launched by a human, and to ensure it has a hidden
    console window of its own instead of no console window (the cause of
    issue #92).

commit 6a7d105
Merge: b007f3e df99aee
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Wed Jun 24 08:18:13 2020 +1000

    Merge pull request #91 from philipstarkey/philipstarkey/issue71

    Incorrect behaviour of default output directory on first run

commit df99aee
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Tue Jun 23 17:34:57 2020 +1000

    Incorrect behaviour of default output directory on first run
    Fixes #71

commit b007f3e
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Tue Jun 23 18:31:22 2020 +1000

    Fix #93: Can't restart subprocess
    Fixes #93

commit 3cf2808
Merge: 2613d48 cda516d
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Mon Jun 22 18:08:55 2020 +1000

    Merge pull request #90 from philipstarkey/master

    Doc updates

commit cda516d
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Sat Jun 20 18:12:50 2020 +1000

    Doc updates

    Renamed API reference URL to match labscript utils and updated config to fix bugs identified in labscript-suite/labscript-utils#57

commit 2613d48
Merge: fbbdfa0 a27a239
Author: Phil Starkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 18:59:59 2020 +1000

    Merge pull request #89 from philipstarkey/master

    Initial commit of sphinx docs

commit a27a239
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 17:07:02 2020 +1000

    Fixed incorrect component used for version

commit 859a44d
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 16:00:13 2020 +1000

    Addressing latest review comments

commit 6c763e7
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 11:18:36 2020 +1000

    Added missing todolist directive on index page

commit 6466ff0
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 11:10:29 2020 +1000

    Updated docs to use jinja template for component doc links

commit 841840a
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 18 17:30:33 2020 +1000

    Initial commit of sphinx docs

commit fbbdfa0
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Wed Jun 17 11:40:02 2020 +1000

    Populated README.md with styling, iconogrpahy, prose, and badges

commit ce96779
Merge: 7562830 a1e2462
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Tue Jun 16 12:06:56 2020 +1000

    Merge pull request #88 from rpanderson/master

    experiment_name changed to apparatus_name

commit a1e2462
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Wed Jun 10 22:52:20 2020 +1000

    experiment_name changed to apparatus_name

    Per labscript-suite/labscript-utils#53

Co-authored-by: chrisjbillington <chrisjbillington@gmail.com>
Co-authored-by: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
philipstarkey added a commit to labscript-suite/lyse that referenced this pull request Jun 25, 2020
@philipstarkey @chrisjbillington @rpanderson
Squashed commit of the following:
d9ad984 
commit f7a1427
Author: Phil Starkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 25 19:03:31 2020 +1000

    Update dependencies in setup.cfg

    Bumped runmanager and labscript_utils versions to `>=3.0.0`

commit 20cb9af
Merge: 74dfc19 2d8a80e
Author: Phil Starkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 25 12:56:40 2020 +1000

    Merge pull request #71 from philipstarkey/philipstarkey/issue42

commit 2d8a80e
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Wed Jun 24 19:22:04 2020 +1000

    Run.get_* methods should open the HDF5 file in read-only mode
    Fixes #42

    Also addressed labscript-suite/labscript-utils#47 (removing h5py deprecation warnings) for this module

    Also fixed an issue where calling `set_group` on a `Run` inside a `Sequence` could disable the read-only mode of the `Run` object.

    Added `no_write` support to `Sequence`.

commit 74dfc19
Merge: 1fc61cb 6cd5d06
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Mon Jun 22 18:06:38 2020 +1000

    Merge pull request #70 from philipstarkey/master

    fix docs conf bugs identified in labscript-suite/labscript-utils#57

commit 6cd5d06
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Sat Jun 20 18:35:29 2020 +1000

    fix docs conf bugs identified in labscript-suite/labscript-utils#57

commit 1fc61cb
Merge: c6c2aa7 eed3f6e
Author: Phil Starkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 19:01:03 2020 +1000

    Merge pull request #69 from philipstarkey/master

    Empty sphinx project following our template

commit eed3f6e
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 18:30:22 2020 +1000

    Empty sphinx project following our template

commit c6c2aa7
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Wed Jun 17 11:39:43 2020 +1000

    Populated README.md with styling, iconogrpahy, prose, and badges

commit 5760b8a
Merge: bb2061d 84c6ec7
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Tue Jun 16 12:07:02 2020 +1000

    Merge pull request #68 from rpanderson/master

    experiment_name changed to apparatus_name

commit 84c6ec7
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Wed Jun 10 22:54:44 2020 +1000

    experiment_name changed to apparatus_name

    Per labscript-suite/labscript-utils#53

Co-authored-by: chrisjbillington <chrisjbillington@gmail.com>
Co-authored-by: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
philipstarkey added a commit to labscript-suite/blacs that referenced this pull request Jun 25, 2020
@philipstarkey @chrisjbillington @rpanderson
Squashed commit of the following:
6ea046b 
commit 348bbeb
Author: Phil Starkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 25 19:47:34 2020 +1000

    Update dependencies in setup.cfg

    Bumped labscript_devices and labscript_utils versions to `>=3.0.0`

commit 24b3728
Merge: f3a5f41 0a3df34
Author: Phil Starkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 25 12:55:47 2020 +1000

    Merge pull request #77 from chrisjbillington/anywhere-unit-conversions

    Allow BLACS to use conversion classes defined outside labscript_utils

commit 0a3df34
Author: chrisjbillington <chrisjbillington@gmail.com>
Date:   Wed Jun 24 22:50:15 2020 -0400

    Fix error message formatting args being the wrong way around

commit 9ed2890
Author: chrisjbillington <chrisjbillington@gmail.com>
Date:   Wed Jun 24 19:26:10 2020 -0400

    Allow BLACS to use conversion classes defined outside labscript_utils

    Labscript has long-since saved unit conversions with their full import
    path instead of just a class name, and
    `labscript_utils.unitconversisons` has provided a function
    `get_unit_conversion_class()` to look them up.

    Here we just use that function to look up unit calibration classes.
    `get_unit_conversion_class()` falls back to the old behaviour of
    importing all unit conversion modules in
    `labscript_utils.unitconversisons` and looking for the given class if it
    encounters an unqualified class name.

commit f3a5f41
Merge: 88eb635 cb41ec0
Author: Chris Billington <chrisjbillington@gmail.com>
Date:   Wed Jun 24 20:47:58 2020 -0400

    Merge pull request #78 from philipstarkey/fix-h5py-file-mode

    Addresses labscript-suite/labscript-utils#47

commit cb41ec0
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Thu Jun 25 10:32:57 2020 +1000

    Addresses labscript-suite/labscript-utils#47

commit 88eb635
Merge: 968afbc 6439a26
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Mon Jun 22 18:07:29 2020 +1000

    Merge pull request #76 from philipstarkey/master

    fix docs conf bugs identified in labscript-suite/labscript-utils#57

commit 6439a26
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Sat Jun 20 18:32:02 2020 +1000

    fix docs conf bugs identified in labscript-suite/labscript-utils#57

commit 968afbc
Merge: 51a47c1 de2d967
Author: Phil Starkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 19:00:41 2020 +1000

    Merge pull request #75 from philipstarkey/master

    Empty sphinx project following our template

commit de2d967
Author: philipstarkey <philipstarkey@users.noreply.github.com>
Date:   Fri Jun 19 17:18:04 2020 +1000

    Empty sphinx project following our template

commit 51a47c1
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Wed Jun 17 10:24:16 2020 +1000

    Abbreviate installation instructions in README.md

commit fe40066
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Tue Jun 16 22:19:12 2020 +1000

    Populated README.md with styling, iconogrpahy, prose, and badges

commit 06e430b
Merge: e739553 1d1e9c4
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Tue Jun 16 12:07:07 2020 +1000

    Merge pull request #73 from rpanderson/master

    experiment_name changed to apparatus_name

commit 1d1e9c4
Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Date:   Wed Jun 10 22:50:36 2020 +1000

    experiment_name changed to apparatus_name

    Per labscript-suite/labscript-utils#53

Co-authored-by: chrisjbillington <chrisjbillington@gmail.com>
Co-authored-by: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Change experiment_name to apparatus_name in labconfig
1 participant
@rpanderson