Skip to content

Allow BLACS to use conversion classes defined outside labscript_utils #77

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 2 commits into from
Jun 25, 2020
Merged

Allow BLACS to use conversion classes defined outside labscript_utils #77

merged 2 commits into from
Jun 25, 2020

Conversation

chrisjbillington
Copy link
Member

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.

philipstarkey
philipstarkey reviewed Jun 25, 2020
View reviewed changes
@chrisjbillington
Allow BLACS to use conversion classes defined outside labscript_utils
9ed2890 
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.
@chrisjbillington chrisjbillington force-pushed the anywhere-unit-conversions branch from 3672f96 to 9ed2890 Compare June 25, 2020 01:54
@philipstarkey philipstarkey merged commit 24b3728 into labscript-suite:master Jun 25, 2020
@chrisjbillington chrisjbillington deleted the anywhere-unit-conversions branch June 25, 2020 02:58
philipstarkey added a commit 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>
Loki27182 pushed a commit to Loki27182/blacs that referenced this pull request Oct 9, 2023
@chrisjbillington
Merged in fix-memory-leak (pull request labscript-suite#77)
47bd1fb 
Shutdown tab's OutputBox when a tab is closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@philipstarkey philipstarkey philipstarkey 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.
2 participants
@chrisjbillington @philipstarkey