Commit e6f3311
committed
Squashed commit of the following:
commit 6c5181f2fa45b572c0366285bd9a09f5b363efc2
Author: David Meyer <[email protected]>
Date: Fri Apr 11 13:59:24 2025 -0400
Merge pull request #113 from dihm/workflow_refresh
Workflow refresh
commit 58c124a622e5db65d4bff3c2e03f83365e9bbef2
Author: David Meyer <[email protected]>
Date: Fri Jul 12 17:15:52 2024 -0400
Fix typo in metadata
commit 24c5b7a6af994e4ddd494fc2a6802fcb6ce1b0da
Author: David Meyer <[email protected]>
Date: Fri Jul 12 17:11:01 2024 -0400
Merge pull request #110 from dihm/setuptools_scm_fix2
Add setuptools_scm build arguments to pyproject.toml
commit 58505653fcdb1da50c1fb0dc3f6c7bd60029068e
Author: David Meyer <[email protected]>
Date: Tue Mar 19 10:27:24 2024 -0400
Merge pull request #111 from dihm/runmanager_dep_break
Remove latent dependency on runmanager due to `get_shot_globals`.
commit 4cd0cf319ec1a3a1ba7a8f4b53f0cd48c1030b92
Author: Phil Starkey <[email protected]>
Date: Sat Feb 17 15:13:13 2024 +1100
Merge pull request #102 from philipstarkey/philipstarkey/v3-refactor
This is a first pass attempt at breaking up `labscript.py` into separate files. The idea here is that, while this might not be how we ultimately want things to be split up, at this point something is better than nothing. This should provide enough of a base that other people begin to feel comfortable moving things around and/or breaking things up logically. It also introduces some conceptual boundaries between output classes and the base device classes that handle timing/clock generation. My hope is that this split will open up the possibility of actually writing tests for some of this stuff. That's probably still a long way off (with several more refactors in between) but it's a step towards that goal!
Other changes:
* More modern context managers for warning suppression that can actually be used to enable/disable warnings, not just disable.
* `config` is moved into `compiler` which means it should get reset between labscript shots and not just globally changed until you reload the compiler subprocess in runmanager.
* Some better/more consistent formatting. I didn't run `black`/`ruff` but I think we should think about it soon.
* Updated error message string formatting to use `f` strings for increased code readability
* Fixed a mistake with trigger error detection that was never raised (and also the `if` condition around the unraised error was wrong anyway)
* Fixed a minor bug in an error message for shutters (had open/close the wrong way around)
* Probably some other small changes.
commit 87cab030f05562171984f3ad1470678a8ac90698
Author: David Meyer <[email protected]>
Date: Fri Feb 9 13:24:34 2024 -0500
Merge pull request #107 from dihm/update_workflow
Update workflow pins to use node.js=20
commit 719460ec1936dc62942c4d85551c528941f7b789
Author: David Meyer <[email protected]>
Date: Fri Feb 9 13:24:20 2024 -0500
Merge pull request #106 from dihm/setuptools_scm_fix
Ensure setuptools_scm uses `release-branch-semver`
commit 3981efc6ce62a1678a9a853073b59d702e931ff1
Author: David Meyer <[email protected]>
Date: Thu Jan 18 20:55:11 2024 -0500
Merge pull request #103 from dihm/rtd_build
Modernize RTD build1 parent f1a4cd6 commit e6f3311
File tree
20 files changed
+4598
-3363
lines changed- .github/workflows
- docs/source
- api
- labscript
20 files changed
+4598
-3363
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
0 commit comments