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.

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

Empty sphinx project following our template #56

Merged
merged 1 commit into from
Jun 19, 2020

Conversation

philipstarkey
Copy link
Member

@philipstarkey philipstarkey commented Jun 19, 2020

@rpanderson rpanderson merged commit bb9f6f5 into labscript-suite:master Jun 19, 2020
rpanderson added a commit that referenced this pull request Jun 19, 2020
commit bb9f6f5
Merge: 0f1cacd 091110b
Author: Russell Anderson <[email protected]>
Date:   Fri Jun 19 17:57:15 2020 +1000

    Merge pull request #56 from philipstarkey/master

    Empty sphinx project following our template

commit 091110b
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 17:42:46 2020 +1000

    Empty sphinx project following our template

commit 0f1cacd
Author: Russell Anderson <[email protected]>
Date:   Wed Jun 17 16:39:08 2020 +1000

    Added missing devices to README.md

commit 5347098
Author: Russell Anderson <[email protected]>
Date:   Wed Jun 17 11:38:03 2020 +1000

    Populated README.md with styling, iconogrpahy, prose, and badges
philipstarkey added a commit that referenced this pull request Jun 25, 2020
commit c9de425
Author: Phil Starkey <[email protected]>
Date:   Thu Jun 25 19:12:29 2020 +1000

    Update dependencies in setup.cfg

    Bumped blacs, labscript and labscript_utils versions to `>=3.0.0`

commit d43ced1
Merge: 3863607 1988032
Author: Chris Billington <[email protected]>
Date:   Wed Jun 24 22:48:26 2020 -0400

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

    Fix h5py deprecation warnings

commit 1988032
Author: philipstarkey <[email protected]>
Date:   Thu Jun 25 10:48:10 2020 +1000

    Fix h5py deprecation warnings

    Addresses labscript-suite/labscript-utils#47 for this module

commit 3863607
Merge: 88eeefe cdd34f8
Author: Phil Starkey <[email protected]>
Date:   Wed Jun 24 10:51:04 2020 +1000

    Merge pull request #54 from rpanderson/dummy_pseudoclock_updates

    Save clock instructions and add runviewer parser for DummyPseudoclock

commit 88eeefe
Merge: 55b1bd8 84eb889
Author: Phil Starkey <[email protected]>
Date:   Wed Jun 24 10:50:09 2020 +1000

    Merge pull request #42 from JQIamo/SpinnakerCamera

    Added SpinnakerCamera

commit cdd34f8
Author: philipstarkey <[email protected]>
Date:   Tue Jun 23 18:34:28 2020 +1000

    Implemented review changes

commit d2e5679
Author: Russell Anderson <[email protected]>
Date:   Fri Jun 12 18:47:25 2020 +1000

    Save clock instructions (mock PineBlaster) and add runviewer_parser

commit 84eb889
Author: philipstarkey <[email protected]>
Date:   Tue Jun 23 12:49:00 2020 +1000

    Implemented review changes

commit 55b1bd8
Merge: bb9f6f5 d5fca30
Author: Russell Anderson <[email protected]>
Date:   Mon Jun 22 18:07:08 2020 +1000

    Merge pull request #57 from philipstarkey/master

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

commit d5fca30
Author: philipstarkey <[email protected]>
Date:   Sat Jun 20 18:33:55 2020 +1000

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

commit bb9f6f5
Merge: 0f1cacd 091110b
Author: Russell Anderson <[email protected]>
Date:   Fri Jun 19 17:57:15 2020 +1000

    Merge pull request #56 from philipstarkey/master

    Empty sphinx project following our template

commit 091110b
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 17:42:46 2020 +1000

    Empty sphinx project following our template

commit 0f1cacd
Author: Russell Anderson <[email protected]>
Date:   Wed Jun 17 16:39:08 2020 +1000

    Added missing devices to README.md

commit 5347098
Author: Russell Anderson <[email protected]>
Date:   Wed Jun 17 11:38:03 2020 +1000

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

commit bd2505e
Author: DSB <[email protected]>
Date:   Mon May 4 14:27:03 2020 -0400

    SpinnakerCamera

    Adding a camera interface that uses FLIR's newer PySpin/Spinnaker API.

    DSB

Co-authored-by: chrisjbillington <[email protected]>
Co-authored-by: Russell Anderson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants