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

Changed URL for API reference to be shorter #57

Merged
merged 3 commits into from
Jun 20, 2020
Merged

Changed URL for API reference to be shorter #57

merged 3 commits into from
Jun 20, 2020

Conversation

philipstarkey
Copy link
Member

@philipstarkey philipstarkey commented Jun 20, 2020 •
edited
Loading

Shortened the URL for the API reference from ../api-reference/... to .../api/...

Will update the others to follow this if people agree.

(Also mainly I did this so we could see what the RTD PR integration looked like!)

@philipstarkey
Copy link
Member Author

philipstarkey commented Jun 20, 2020 •
edited
Loading

Cool! You can view the build result here (or by clicking "show all checks" below and then "details" on the RTD entry).

This negates the need to setup our own RTD projects for our forks (although I may keep mine anyway so I can see the result before making a PR).

@rpanderson
Copy link
Member

labscript_suite_doc_version is stable in the preview build. Is this intentional/expected?

@philipstarkey
Copy link
Member Author

labscript_suite_doc_version is stable in the preview build. Is this intentional/expected?

No...I'll debug

@philipstarkey
Copy link
Member Author

Ok, hopefully this will fix it. I had to distinguish between prior tagged versions (with a RTD_VERSION like 3.0.0) and PR versions (which have a RTD_VERSION like 57 - the PR number)

@philipstarkey
Copy link
Member Author

Noticed a deprecated warning (for the stylesheet) while looking through the build logs so I fixed that too while I was at it. We can copy/paste the updated general config (lines 35 onwards) into the other projects to fix both issues.

@philipstarkey philipstarkey merged commit 5e02b01 into labscript-suite:master Jun 20, 2020
philipstarkey added a commit that referenced this pull request Jun 20, 2020
@philipstarkey
Removed unnecessary fixed title from main TOC
f77525f 
This was erroneously added in #57
philipstarkey added a commit to philipstarkey/runmanager that referenced this pull request Jun 20, 2020
@philipstarkey
Doc updates
cda516d 
Renamed API reference URL to match labscript utils and updated config to fix bugs identified in labscript-suite/labscript-utils#57
@philipstarkey philipstarkey mentioned this pull request Jun 20, 2020
Merged
philipstarkey added a commit to philipstarkey/labscript-suite that referenced this pull request Jun 20, 2020
@philipstarkey
fix docs conf bugs identified in labscript-suite/labscript-utils#57
90330ba
philipstarkey added a commit to philipstarkey/labscript that referenced this pull request Jun 20, 2020
@philipstarkey
Doc updates
88ce952 
Renamed API reference URL to match labscript utils and updated config to fix bugs identified in labscript-suite/labscript-utils#57
@philipstarkey philipstarkey mentioned this pull request Jun 20, 2020
Merged
philipstarkey added a commit to philipstarkey/runviewer that referenced this pull request Jun 20, 2020
@philipstarkey
fix docs conf bugs identified in labscript-suite/labscript-utils#57
760b82c
philipstarkey added a commit to philipstarkey/blacs that referenced this pull request Jun 20, 2020
@philipstarkey
fix docs conf bugs identified in labscript-suite/labscript-utils#57
6439a26
philipstarkey added a commit to philipstarkey/labscript-devices that referenced this pull request Jun 20, 2020
@philipstarkey
fix docs conf bugs identified in labscript-suite/labscript-utils#57
d5fca30
philipstarkey added a commit to philipstarkey/lyse that referenced this pull request Jun 20, 2020
@philipstarkey
fix docs conf bugs identified in labscript-suite/labscript-utils#57
6cd5d06
rpanderson added a commit to labscript-suite/lyse that referenced this pull request Jun 22, 2020
@rpanderson
Merge pull request #70 from philipstarkey/master
74dfc19 
fix docs conf bugs identified in labscript-suite/labscript-utils#57
rpanderson added a commit to labscript-suite/labscript-devices that referenced this pull request Jun 22, 2020
@rpanderson
Merge pull request #57 from philipstarkey/master
55b1bd8 
fix docs conf bugs identified in labscript-suite/labscript-utils#57
rpanderson added a commit to labscript-suite/blacs that referenced this pull request Jun 22, 2020
@rpanderson
Merge pull request #76 from philipstarkey/master
88eb635 
fix docs conf bugs identified in labscript-suite/labscript-utils#57
rpanderson added a commit to labscript-suite/runviewer that referenced this pull request Jun 22, 2020
@rpanderson
Merge pull request #43 from philipstarkey/master
5d48b01 
fix docs conf bugs identified in labscript-suite/labscript-utils#57
rpanderson added a commit to labscript-suite/labscript-suite that referenced this pull request Jun 22, 2020
@rpanderson
Merge pull request #49 from philipstarkey/master
17f02fe 
fix docs conf bugs identified in labscript-suite/labscript-utils#57
philipstarkey added a commit that referenced this pull request Jun 25, 2020
@philipstarkey
Squashed commit of the following:
a953031 
commit d8b8343
Merge: 9bc7a39 bfa6932
Author: Chris Billington <[email protected]>
Date:   Wed Jun 24 20:48:39 2020 -0400

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

    Addresses #47 for this module

commit 9bc7a39
Merge: 1189334 66d0be4
Author: Chris Billington <[email protected]>
Date:   Wed Jun 24 20:30:42 2020 -0400

    Merge pull request #55 from rpanderson/example_IMAQdx_remote

    Example labscript and analysis scripts for IMAQdxCamera and RemoteBLACS

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

    Addresses #47 for this module

commit 1189334
Merge: 5025b1b 0b0d07a
Author: Chris Billington <[email protected]>
Date:   Wed Jun 24 19:35:15 2020 -0400

    Merge pull request #54 from rpanderson/example_experiment

    Minimal working connection table and example experiment script

commit 66d0be4
Author: Russell Anderson <[email protected]>
Date:   Mon Jun 15 13:37:23 2020 +1000

    lyse analysis script demonstrating some Run methods for example_IMAQdx_remote

commit a48a9c0
Author: Russell Anderson <[email protected]>
Date:   Mon Jun 15 13:15:48 2020 +1000

    Example connection table and labscript experiment script for RemoteBLACS and IMAQdxCamera

commit 5025b1b
Merge: f77525f ed76901
Author: Chris Billington <[email protected]>
Date:   Wed Jun 24 02:16:29 2020 -0400

    Merge pull request #58 from philipstarkey/philipstarkey/issue43

    Fixes .pth file has no effect in editable install

commit ed76901
Author: chrisjbillington <[email protected]>
Date:   Wed Jun 24 01:23:44 2020 -0400

    Move copying of .pth file into setup.py

    Use a custom develop command to copy the .pth file into site-packages
    when `python setup.py develop` is run - this is what pip does under the
    hood for `pip install -e`.

    No longer need desktop-app to locate site-packages, as the setuptools
    command class knows it as `self.install_dir`.

    The file is not removed by `pip uninstall`, but due to the `try:
    except:`s in the `.pth` file, leaving it behind is harmless.

    It is removed if the user runs whatever `setup.py` command undoies

commit 894e245
Author: chrisjbillington <[email protected]>
Date:   Wed Jun 24 00:04:13 2020 -0400

    Require desktop-app 0.2.6

    Which renames `_get_install_directory` to not have an underscore,
    and which fixes a bug preventing docs from building on RTD.

commit 271439e
Author: philipstarkey <[email protected]>
Date:   Wed Jun 24 12:53:49 2020 +1000

    Removed support for custom development directories from path

commit dd098a5
Author: philipstarkey <[email protected]>
Date:   Wed Jun 24 12:38:19 2020 +1000

    Fixes .pth file has no effect in editable install
    Fixes #43

    The .pth file is now copied during `labscript-profile-create` if it does not exist in the site-packages dir (where the .egg-info files exist) and if it the .pth file exists in the package structure (aka labscript-utils it is an editable install)

    The labscript-suite.pth file has been updated to not raise an exception if labscript-suite has been uninstalled (so we do not have to worry about cleanup).

    Also updated the `labscript_profile.add_userlib_and_pythonlib` function to use the `site` library for adding userlib and pythonlib to the system path.

commit 0b0d07a
Author: Russell Anderson <[email protected]>
Date:   Mon Jun 22 17:48:00 2020 +1000

    start()/stop() in __main__ block so connection table can be imported

commit 4c19de9
Author: Russell Anderson <[email protected]>
Date:   Mon Jun 15 13:12:52 2020 +1000

    Add AnalogOut with ramp example, rename DigitalOut connection

commit 9b64a0d
Author: Russell Anderson <[email protected]>
Date:   Wed Jun 10 23:09:03 2020 +1000

    Minimal example connection table and labscript using dummy devices

commit f77525f
Author: Phil Starkey <[email protected]>
Date:   Sat Jun 20 18:09:53 2020 +1000

    Removed unnecessary fixed title from main TOC

    This was erroneously added in #57

commit 5e02b01
Merge: 3f78207 8b19766
Author: Phil Starkey <[email protected]>
Date:   Sat Jun 20 18:07:04 2020 +1000

    Merge pull request #57 from philipstarkey/master

    Changed URL for API reference to be shorter
    Fixed bug with readthedocs auto PR build

commit 8b19766
Author: philipstarkey <[email protected]>
Date:   Sat Jun 20 12:02:51 2020 +1000

    Updated method call for stylesheet to remove deprecated warning in build

commit 56fdd63
Author: philipstarkey <[email protected]>
Date:   Sat Jun 20 11:46:33 2020 +1000

    Fixed sphinx conf to detect PR builds and link to 'latest' instead of stable

commit 9889d19
Author: philipstarkey <[email protected]>
Date:   Sat Jun 20 10:44:04 2020 +1000

    Changed URL for API reference to be shorter

commit 3f78207
Merge: bbd928a bf9d10e
Author: Phil Starkey <[email protected]>
Date:   Fri Jun 19 18:58:37 2020 +1000

    Merge pull request #56 from philipstarkey/master

    Added links to other component docs

commit bf9d10e
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 16:06:09 2020 +1000

    Addressing latest review comments

commit e75b6bc
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 11:23:49 2020 +1000

    Updated docs to use jinja template for component doc links

commit 9c61238
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 17:14:57 2020 +1000

    Removed autogenerated rst file from version control

commit 2303185
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:43:29 2020 +1000

    Updated .gitignore with latest GitHub defaults

commit 87b757e
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:39:52 2020 +1000

    Relocated custom sphinx gitignore rules

commit 75813a5
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:31:01 2020 +1000

    Updated PR as per review in labscript-suite/labscript-suite#48

commit bbd928a
Author: Russell Anderson <[email protected]>
Date:   Wed Jun 17 11:39:17 2020 +1000

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

commit 573c521
Author: philipstarkey <[email protected]>
Date:   Tue Jun 16 18:10:25 2020 +1000

    Added links to other component docs
philipstarkey added a commit to labscript-suite/labscript that referenced this pull request Jun 25, 2020
@philipstarkey @chrisjbillington @rpanderson
Squashed commit of the following:
83856d6 
commit c3b7988
Author: Phil Starkey <[email protected]>
Date:   Thu Jun 25 18:27:06 2020 +1000

    Update labscript_utils dependency to `>=3.0.0`

commit 822e5d5
Merge: 2e2785c 39c6f0b
Author: Russell Anderson <[email protected]>
Date:   Thu Jun 25 15:48:15 2020 +1000

    Merge pull request #69 from rpanderson/example_fix

    Make example labscript functional and format using black

commit 39c6f0b
Author: Russell Anderson <[email protected]>
Date:   Thu Jun 25 12:34:08 2020 +1000

    Name all the args

commit 255d74e
Author: Russell Anderson <[email protected]>
Date:   Thu Jun 25 12:11:48 2020 +1000

    Name all arguments in connection table

commit e3d3ece
Author: Russell Anderson <[email protected]>
Date:   Thu Jun 25 11:08:25 2020 +1000

    Omit __init__ import and comply with flake8 F403

commit 6b26f1f
Author: Russell Anderson <[email protected]>
Date:   Sun May 31 17:38:18 2020 +1000

    Make example labscript functional and format using black

commit 2e2785c
Merge: 62b9098 4e77810
Author: Chris Billington <[email protected]>
Date:   Wed Jun 24 21:22:05 2020 -0400

    Merge pull request #70 from rpanderson/is-syntax-warning-bugfix

    Bugfix for ValueError introduced in #68

commit 4e77810
Author: Russell Anderson <[email protected]>
Date:   Thu Jun 25 11:18:56 2020 +1000

    Abbreviated bugfix.

commit a667f7e
Author: Russell Anderson <[email protected]>
Date:   Thu Jun 25 11:17:11 2020 +1000

    Bugfix for ValueError introduced in #68

commit 62b9098
Merge: 0e23ed0 1746399
Author: Chris Billington <[email protected]>
Date:   Wed Jun 24 20:49:32 2020 -0400

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

    Fix h5py deprecation warning

commit 0e23ed0
Merge: 5b52c20 6373f02
Author: Chris Billington <[email protected]>
Date:   Wed Jun 24 18:47:18 2020 -0400

    Merge pull request #68 from rpanderson/is-syntax-warning

    Do not use 'is' for numeric literal comparisons

commit 6373f02
Author: Russell Anderson <[email protected]>
Date:   Thu Jun 25 08:36:55 2020 +1000

    Omitted 'is' with numeric literal comparisons

commit 1746399
Author: philipstarkey <[email protected]>
Date:   Wed Jun 24 18:29:12 2020 +1000

    Fix h5py deprecation warning

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

commit 5b52c20
Merge: 0362fa7 88ce952
Author: Russell Anderson <[email protected]>
Date:   Mon Jun 22 18:09:54 2020 +1000

    Merge pull request #66 from philipstarkey/master

    Doc updates

commit 88ce952
Author: philipstarkey <[email protected]>
Date:   Sat Jun 20 18:17:23 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 0362fa7
Merge: 74869ef 52d3b9f
Author: Phil Starkey <[email protected]>
Date:   Fri Jun 19 18:58:04 2020 +1000

    Merge pull request #65 from philipstarkey/master

    Updated docs to follow our standard conf

commit 52d3b9f
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 16:04:04 2020 +1000

    Addressing latest review comments

commit 7674a8f
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 11:19:33 2020 +1000

    Updated docs to use jinja template for component doc links

commit d4474e2
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:43:10 2020 +1000

    Updated .gitignore with latest GitHub defaults

commit a18a0d1
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:39:35 2020 +1000

    Relocated custom sphinx git ignore rules

commit 80aa5a1
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:21:44 2020 +1000

    Restored 64 pixel logo accidentally replaced with 32 pixel logo

commit 42d3bc6
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:17:42 2020 +1000

    Updated install requirement to 3.0.0rc1+

commit 1961a2c
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:13:40 2020 +1000

    testing dependency fix

commit 234753d
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:07:41 2020 +1000

    Updated as per the review in labscript-suite/labscript-suite#48

commit 74869ef
Author: Russell Anderson <[email protected]>
Date:   Wed Jun 17 10:24:43 2020 +1000

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

commit 28dc675
Author: philipstarkey <[email protected]>
Date:   Tue Jun 16 18:24:26 2020 +1000

    Removed unnecessary header and added intersphinx link

commit 35c5466
Author: philipstarkey <[email protected]>
Date:   Tue Jun 16 17:19:33 2020 +1000

    Updated docs to follow our standard conf

    Also added links to other labscript suite docs and standard links.

Co-authored-by: chrisjbillington <[email protected]>
Co-authored-by: Russell Anderson <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Tue Jun 23 17:34:57 2020 +1000

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

commit b007f3e
Author: philipstarkey <[email protected]>
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 <[email protected]>
Date:   Mon Jun 22 18:08:55 2020 +1000

    Merge pull request #90 from philipstarkey/master

    Doc updates

commit cda516d
Author: philipstarkey <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Fri Jun 19 17:07:02 2020 +1000

    Fixed incorrect component used for version

commit 859a44d
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 16:00:13 2020 +1000

    Addressing latest review comments

commit 6c763e7
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 11:18:36 2020 +1000

    Added missing todolist directive on index page

commit 6466ff0
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 11:10:29 2020 +1000

    Updated docs to use jinja template for component doc links

commit 841840a
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 17:30:33 2020 +1000

    Initial commit of sphinx docs

commit fbbdfa0
Author: Russell Anderson <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Co-authored-by: Russell Anderson <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Thu Jun 25 12:56:40 2020 +1000

    Merge pull request #71 from philipstarkey/philipstarkey/issue42

commit 2d8a80e
Author: philipstarkey <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Fri Jun 19 18:30:22 2020 +1000

    Empty sphinx project following our template

commit c6c2aa7
Author: Russell Anderson <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Co-authored-by: Russell Anderson <[email protected]>
philipstarkey added a commit to labscript-suite/labscript-devices that referenced this pull request Jun 25, 2020
@philipstarkey @chrisjbillington @rpanderson
Squashed commit of the following:
080e054 
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]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Wed Jun 24 22:50:15 2020 -0400

    Fix error message formatting args being the wrong way around

commit 9ed2890
Author: chrisjbillington <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Thu Jun 25 10:32:57 2020 +1000

    Addresses labscript-suite/labscript-utils#47

commit 88eb635
Merge: 968afbc 6439a26
Author: Russell Anderson <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Fri Jun 19 17:18:04 2020 +1000

    Empty sphinx project following our template

commit 51a47c1
Author: Russell Anderson <[email protected]>
Date:   Wed Jun 17 10:24:16 2020 +1000

    Abbreviate installation instructions in README.md

commit fe40066
Author: Russell Anderson <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Co-authored-by: Russell Anderson <[email protected]>
philipstarkey added a commit to labscript-suite/runviewer that referenced this pull request Jun 25, 2020
@philipstarkey @rpanderson
Squashed commit of the following:
8f441c5 
commit fc4e42a
Author: Phil Starkey <[email protected]>
Date:   Thu Jun 25 19:53:12 2020 +1000

    Update dependencies in setup.cfg

    Bumped labscript_devices and labscript_utils versions to `>=3.0.0`

commit 5d48b01
Merge: d7dbb60 760b82c
Author: Russell Anderson <[email protected]>
Date:   Mon Jun 22 18:07:48 2020 +1000

    Merge pull request #43 from philipstarkey/master

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

commit 760b82c
Author: philipstarkey <[email protected]>
Date:   Sat Jun 20 18:29:58 2020 +1000

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

commit d7dbb60
Merge: 8eac42a fd63ef4
Author: Phil Starkey <[email protected]>
Date:   Fri Jun 19 19:00:21 2020 +1000

    Merge pull request #42 from philipstarkey/master

    Empty sphinx project following our template

commit fd63ef4
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 17:08:29 2020 +1000

    Empty sphinx project following our template

commit 8eac42a
Author: Russell Anderson <[email protected]>
Date:   Wed Jun 17 10:31:32 2020 +1000

    Contextualise installation instructions in README.md

commit a54f961
Author: Russell Anderson <[email protected]>
Date:   Tue Jun 16 21:07:05 2020 +1000

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

Co-authored-by: Russell Anderson <[email protected]>
philipstarkey added a commit to labscript-suite/labscript-suite that referenced this pull request Jun 25, 2020
@philipstarkey @rpanderson
Squashed commit of the following:
fba5b50 
commit 76e7b63
Author: Phil Starkey <[email protected]>
Date:   Thu Jun 25 20:09:18 2020 +1000

    Update dependencies in setup.cfg

    Bumped all labscript-suite dependencies to `>=3.0.0`

commit 1567faa
Merge: 17f02fe e0ac239
Author: Russell Anderson <[email protected]>
Date:   Thu Jun 25 15:48:24 2020 +1000

    Merge pull request #50 from rpanderson/labscript-profile-dir-docs

    Clarify note about labscript-suite/labscript-utils#37

commit e0ac239
Author: Russell Anderson <[email protected]>
Date:   Thu Jun 25 15:43:26 2020 +1000

    Clarify note about labscript-suite/labscript-utils#37

commit 17f02fe
Merge: 907619d 90330ba
Author: Russell Anderson <[email protected]>
Date:   Mon Jun 22 18:08:23 2020 +1000

    Merge pull request #49 from philipstarkey/master

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

commit 90330ba
Author: philipstarkey <[email protected]>
Date:   Sat Jun 20 18:14:39 2020 +1000

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

commit 907619d
Author: Russell Anderson <[email protected]>
Date:   Fri Jun 19 16:50:41 2020 +1000

    64x64 icons per other styling, and https doi badge

commit 25fe511
Merge: fadeab2 3b8377d
Author: Phil Starkey <[email protected]>
Date:   Fri Jun 19 16:43:34 2020 +1000

    Merge pull request #48 from philipstarkey/master

    Added links to other component docs

commit 3b8377d
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 15:57:44 2020 +1000

    Addressing latest review comments

commit d5e175b
Author: philipstarkey <[email protected]>
Date:   Fri Jun 19 10:56:52 2020 +1000

    Simplified sphinx conf by moving logic into template

commit 6abe116
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 19:14:25 2020 +1000

    Moved auto generated components.rst to a jinja2 template

commit 8159129
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:43:21 2020 +1000

    Updated .gitignore with latest GitHub defaults

commit d697cb9
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:40:30 2020 +1000

    Relocated custom sphinx gitignore rules (and restored the original)

commit 42172f5
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:32:45 2020 +1000

    reversed order of sections in .gitignore

    This is so that custom rules added by git tools will be in the right section when they are appended to the file

commit cb399ec
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 16:09:49 2020 +1000

    Split out metapackage link in generalised config
    (hidden in docs built for this project)

    * also removed metapackage table from components page (since I realised I shouldn't have really added it)

commit a00526b
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 13:06:16 2020 +1000

    Fixed bug where component docs URLs were alsways using "latest".

    * Now use the intersphinx mapping URL already generated
    * Also added entry for metapackage

commit 58ed4fd
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 12:31:24 2020 +1000

    Added dynamic generation of labscript suite component table

commit b3087a6
Author: philipstarkey <[email protected]>
Date:   Thu Jun 18 11:10:54 2020 +1000

    Implemented some review changes

    * fixed typo in labscriptsuite.org URLs
    * Updated to use `pathlib`
    * Updated .gitignore to delineate custom and generic ignore rules
    * renamed component_docs.rst -> components.rst

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

    README.md badges and edits

commit e419ce1
Author: Russell Anderson <[email protected]>
Date:   Tue Jun 16 21:03:32 2020 +1000

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

commit 8e5ea93
Author: philipstarkey <[email protected]>
Date:   Tue Jun 16 18:08:33 2020 +1000

    black formatting

commit 0f0da2e
Author: philipstarkey <[email protected]>
Date:   Tue Jun 16 18:06:02 2020 +1000

    Added links to other component docs

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
Reviewers

@rpanderson rpanderson rpanderson 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
@philipstarkey @rpanderson