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

Prevent h5_lock import during docs build #96

Merged
merged 1 commit into from Feb 5, 2022

Conversation

dihm
Copy link
Contributor

@dihm dihm commented Feb 5, 2022

Update docs conf.py to get version using importlib_metadata to avoid incidental import of labscript_utils.h5_lock.

Note that labscript_utils is already being mocked by autodoc.

incidental import of labscript_utils.h5_lock.
@dihm dihm added bug Something isn't working documentation Improvements or additions to documentation labels Feb 5, 2022
@dihm dihm merged commit 9db7818 into labscript-suite:master Feb 5, 2022
@dihm dihm deleted the mock_labscript_utils branch February 5, 2022 11:09
dihm added a commit that referenced this pull request Apr 13, 2023
commit 82db032
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Apr 12 19:44:34 2023 -0400

    Update python version support

commit 209071b
Merge: dfbc653 5f05e59
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Apr 12 16:52:14 2023 -0400

    Merge pull request #104 from dihm/update-workflow

    Sync workflow with latest and greatest

commit 5f05e59
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Apr 12 16:39:47 2023 -0400

    Sync workflow with latest and greatest

commit dfbc653
Merge: 1f0c876 405331e
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Apr 12 16:37:40 2023 -0400

    Merge pull request #103 from dihm/figuremanager_hotfix

    Fix signature mis-match when loading custom FigureManager backend

commit 405331e
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Mon Mar 13 13:11:35 2023 -0400

    Fix signature mis-match when loading custom FigureManager backend.

commit 1f0c876
Merge: e703362 8b03da8
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Fri Aug 5 16:04:56 2022 -0400

    Merge pull request #100 from dihm/update-workflow

    Bring workflow up to date with sandbox

commit 8b03da8
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Wed Aug 3 13:19:49 2022 -0400

    Bring workflow up to date with sandbox

commit e703362
Merge: 67a6c8f 6a839f4
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Thu Jun 2 10:59:07 2022 -0400

    Merge pull request #99 from dihm/fix_docs_build

    Bump sphinx pin and update intersphinx links

commit 6a839f4
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Thu Jun 2 10:54:25 2022 -0400

    Bump sphinx pin and update intersphinx links

commit 67a6c8f
Merge: 6ade884 ed55aad
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Tue May 31 12:37:05 2022 -0400

    Merge pull request #97 from ispielma/LyseSimpleData

    Lyse simple data

commit ed55aad
Merge: 1d37c94 6ade884
Author: spielman <spielman@umd.edu>
Date:   Tue May 31 08:10:41 2022 -0400

    Merge remote-tracking branch 'origin/master' into LyseSimpleData

commit 6ade884
Merge: 9db7818 981443d
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Fri May 20 16:46:31 2022 -0400

    Merge pull request #98 from th0mam/th0mam-patch-1

    Definition of new functions "get_wait" and "get_waits"

commit 981443d
Author: th0mam <102957233+th0mam@users.noreply.github.com>
Date:   Fri May 20 09:42:03 2022 +0200

    Update __init__.py

commit 274c6f0
Author: th0mam <102957233+th0mam@users.noreply.github.com>
Date:   Mon May 9 13:11:39 2022 +0200

    Definition of new function "get_waits"

    I defined a new function "get_waits".
    Returns a 2D array of times and timeout statuses.
    This may be quite useful to some teams, where timeout signifies faulty experiment, and so unusable data.

commit 1d37c94
Author: spielman <spielman@umd.edu>
Date:   Mon May 2 11:22:51 2022 -0400

    Added spaces to be more standard.

commit 9d9d1de
Author: spielman <spielman@umd.edu>
Date:   Mon May 2 11:22:00 2022 -0400

    Update for pull request.

commit c3a837f
Author: spielman <spielman@umd.edu>
Date:   Fri Apr 22 11:31:49 2022 -0400

    Added method to return a dictionary of images rather than just a list.

commit 263c70f
Merge: 1a3ec8d 9db7818
Author: Ian B. Spielman <54444522+ispielma@users.noreply.github.com>
Date:   Wed Feb 16 14:22:27 2022 -0500

    Merge branch 'labscript-suite:master' into LyseSimpleData

commit 1a3ec8d
Author: Ian Spielman <spielman@umd.edu>
Date:   Wed Feb 16 14:21:20 2022 -0500

    Changes to allow get trace to return the raw data.  This solves an issue that the TeX scope class does not save timing information, just four traces.

commit 9db7818
Merge: 7b11b71 eb240fd
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Sat Feb 5 06:09:31 2022 -0500

    Merge pull request #96 from dihm/mock_labscript_utils

    Prevent h5_lock import during docs build

commit eb240fd
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Sat Feb 5 06:05:04 2022 -0500

    Update docs `conf.py` to get version using importlib_metadata to avoid
    incidental import of labscript_utils.h5_lock.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant