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

Change default of save_hg_info to #90

Merged
merged 1 commit into from
May 31, 2022

Conversation

ispielma
Copy link
Contributor

There is no reason that we should be default trying to save hg info (particularly since we have moved to github). In my case, this cased a problem in runmanager whereby the compile thread would hard-crash when the vcs function could not find the hg executable. Of course one solution here is to use the save_hg_info (or save_git_info) option in the labconfig file, but since these do not appear in the default files I think it is better to turn off the option be default.

@chrisjbillington chrisjbillington merged commit b67bc30 into labscript-suite:master May 31, 2022
@chrisjbillington
Copy link
Member

Yep, this is a no-brainer.

@ispielma ispielma deleted the NoHG branch June 1, 2022 11:29
dihm added a commit that referenced this pull request Aug 5, 2022
commit 82f2b7e
Merge: 43d9901 727caf1
Author: David Meyer <[email protected]>
Date:   Fri Aug 5 16:14:04 2022 -0400

    Merge pull request #94 from dihm/update-workflow

    Bring workflow up to date with sandbox

commit 727caf1
Author: David Meyer <[email protected]>
Date:   Wed Aug 3 13:22:55 2022 -0400

    Bring workflow up to date with sandbox

commit 43d9901
Merge: b67bc30 c48a1f2
Author: David Meyer <[email protected]>
Date:   Thu Jun 2 10:36:50 2022 -0400

    Merge pull request #92 from dihm/fix_docs_build

    Bump sphinx pin and update intersphinx links

commit c48a1f2
Author: David Meyer <[email protected]>
Date:   Thu Jun 2 10:33:45 2022 -0400

    Bump sphinx pin and update intersphinx links

commit b67bc30
Merge: efa479a d554160
Author: Chris Billington <[email protected]>
Date:   Wed Jun 1 09:38:08 2022 +1000

    Merge pull request #90 from ispielma/NoHG

    Change default of save_hg_info to

commit d554160
Author: Ian Spielman <[email protected]>
Date:   Tue May 31 13:45:02 2022 -0400

    Change default of save_hg_info to

commit efa479a
Merge: de6fb95 a9888d5
Author: David Meyer <[email protected]>
Date:   Mon May 30 07:29:54 2022 -0400

    Merge pull request #88 from philipstarkey/philipstarkey/issue51

    Introduce a new attribute for `IntermediateDevice` defining the minimum clock high time

commit de6fb95
Merge: 763a0f1 aadd476
Author: David Meyer <[email protected]>
Date:   Sat Feb 5 06:01:08 2022 -0500

    Merge pull request #87 from dihm/docs_mock_imports

    Mock `labscript_utils` to prevent RTD from trying to launch zprocess.

commit a9888d5
Author: Phil Starkey <[email protected]>
Date:   Sat Feb 5 20:31:56 2022 +1100

    Introduce a new attribute for `IntermediateDevice`s that allows them to specify a minimum clock high time in order to allow asymmetric clock ticks when combined with gated clocks on a pseudoclock. `minimum_clock_high_time` defaults to half of the minimum time between `IntermediateDevice` instructions. It be backwards compatible with previous versions of labscript devices.

    Fixes #51.

    I also discovered a bug where the check against the next all change time did not capture the last change time on the clock line because the stop time had not yet been added. This is now fixed.

    There were also some issues with various error messages. I've fixed those too and moved to use f strings so they're more readable.

    The whole `Pseudoclock.collect_change_times` method has also been reformatted in line with how `black` would format it (since I was working on it anyway). Some commented out code was also removed here too.

commit aadd476
Author: David Meyer <[email protected]>
Date:   Fri Feb 4 08:51:54 2022 -0500

    Re-attempt to mock `labscript_utils` import so autosummary can work.

commit 755e562
Author: David Meyer <[email protected]>
Date:   Fri Feb 4 08:40:06 2022 -0500

    Reset pins, use importlib_metadata to get version in `conf.py`.

commit d5750bb
Author: David Meyer <[email protected]>
Date:   Thu Feb 3 14:36:46 2022 -0500

    Remove zprocess pins and pin labscript-utils to last known working version.

commit a5b195d
Author: David Meyer <[email protected]>
Date:   Thu Feb 3 14:29:19 2022 -0500

    Back to last known working zprocess version.

commit 9294f98
Author: David Meyer <[email protected]>
Date:   Thu Feb 3 14:27:16 2022 -0500

    Change pin back on more.

commit d9b0cd0
Author: David Meyer <[email protected]>
Date:   Thu Feb 3 14:24:39 2022 -0500

    Remove mock, test which version of zprocess is causing change by
    temporarily pinning it.

commit 60d21fa
Author: David Meyer <[email protected]>
Date:   Thu Feb 3 14:03:01 2022 -0500

    Mock `labscript_utils` to prevent RTD from trying to launch zprocess.
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