Tags: labscript-suite/labscript
Tags
Squashed commit of the following: commit 41d6e1c Merge: bfc65fe b3869b7 Author: David Meyer <dihm@users.noreply.github.com> Date: Fri Apr 11 13:59:24 2025 -0400 Merge pull request #113 from dihm/workflow_refresh Workflow refresh commit b3869b7 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Apr 11 13:54:15 2025 -0400 Update project metadata and remove old dependencies commit 98be5f3 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Apr 11 13:54:02 2025 -0400 Update workflow to latest and greatest commit bfc65fe Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Jul 12 17:15:52 2024 -0400 Fix typo in metadata commit 346ee1d Merge: 24f2d6a b3358c9 Author: David Meyer <dihm@users.noreply.github.com> 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 b3358c9 Author: David Meyer <dihm.meyer@gmail.com> Date: Thu Feb 29 16:24:39 2024 -0500 Make editable installs use `pyproject.toml` setuptools_scm config. Removes no longer necessary `setup.py`. commit 225bbee Author: David Meyer <dihm.meyer@gmail.com> Date: Thu Apr 4 13:57:59 2024 -0400 Move all project metadata to `pyproject.toml` commit f41d956 Author: David Meyer <dihm.meyer@gmail.com> Date: Thu Feb 29 20:30:15 2024 -0500 Make `setuptools_scm` optional, even if installed in editable mode. commit 67a5a89 Author: David Meyer <dihm.meyer@gmail.com> Date: Thu Feb 29 16:19:46 2024 -0500 Remove environment checks in `setup.py` for setuptools_scm commit 003ce6c Author: David Meyer <dihm.meyer@gmail.com> Date: Thu Feb 29 16:19:14 2024 -0500 Remove environment checks on `__version__.py` setuptools_scm commit dfb3b00 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Feb 23 15:16:30 2024 -0500 Remove `SCM_LOCAL_SCHEME` environment variable in release workflow as it is no longer used. commit 06b0b44 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Feb 23 13:47:37 2024 -0500 Add setuptools_scm build arguments to pyproject.toml commit 24f2d6a Merge: 37be1bf 554968f Author: David Meyer <dihm@users.noreply.github.com> 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 554968f Author: David Meyer <dihm@users.noreply.github.com> Date: Tue Mar 19 10:22:34 2024 -0400 Remove latent dependency on runmanager due to `get_shot_globals`. Bumps required version of `labscript_utils` to match. commit 37be1bf Merge: 332c180 714d982 Author: Phil Starkey <philipstarkey@users.noreply.github.com> 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 332c180 Merge: a99573e 1071fee Author: David Meyer <dihm@users.noreply.github.com> 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 a99573e Merge: 6f38c9a bf0d2b7 Author: David Meyer <dihm@users.noreply.github.com> 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 bf0d2b7 Author: David Meyer <dihm@users.noreply.github.com> Date: Fri Feb 9 13:21:32 2024 -0500 Ensure setuptools_scm uses `release-branch-semver` Updates setuptools and setuptools_scm pin in the build. commit 1071fee Author: David Meyer <dihm@users.noreply.github.com> Date: Fri Feb 9 13:19:20 2024 -0500 Update workflow pins to use node.js=20 commit 714d982 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Jan 27 16:24:56 2024 +1100 Remove `compiler` module from autosummary documentation due to a bug that breaks documentation. commit 7e0ab10 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Jan 27 16:20:40 2024 +1100 Reamed `Compiler` class to work around an autosummary bug commit 32b3d6e Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Jan 27 16:15:18 2024 +1100 Updated module doc strings so they are only a single sentence and relocated `print_time()` function to utils. commit 5ea15e8 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Jan 27 16:05:28 2024 +1100 Added copyright notices and docstrings to new files commit 5c04f42 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Jan 27 15:49:00 2024 +1100 Split `AnalogIn` into it's own module so that documentation makes a little more sese commit 59757a4 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Jan 27 13:08:04 2024 +1100 Added note about not using generic classes directly commit 9a9e205 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Jan 27 13:00:34 2024 +1100 Attempt to fix module cross reference commit 8775e24 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Jan 27 12:55:17 2024 +1100 Updated connection table documentation with links to class documentation. commit 36dad35 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Jan 27 12:37:53 2024 +1100 First pass at getting new files included in the docs commit ba082c1 Merge: 91025be 6f38c9a Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Sat Jan 27 12:24:42 2024 +1100 Merge branch 'labscript-suite:master' into philipstarkey/v3-refactor commit 91025be Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Jan 27 12:16:47 2024 +1100 Revert change to use public property in `ClockLine.add_device` internals commit 6f38c9a Merge: 01cc205 dd410e4 Author: David Meyer <dihm@users.noreply.github.com> Date: Thu Jan 18 20:55:11 2024 -0500 Merge pull request #103 from dihm/rtd_build Modernize RTD build commit dd410e4 Author: David Meyer <dihm@users.noreply.github.com> Date: Thu Jan 18 20:51:16 2024 -0500 Modernize RTD build commit 5b580ad Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Thu Jan 4 17:30:11 2024 +1100 Fix bug with cached imports in utils commit 4d0089b Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Thu Jan 4 17:29:52 2024 +1100 Fix bug in error condition. This was an error that perviously wasn't raised (message was formed, but not raised), hence why the incorrect condition was never noticed. commit 96b3dd3 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Thu Jan 4 17:28:26 2024 +1100 Revert change made that tried to write to a property commit 6d4535b Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Wed Jan 3 20:40:40 2024 +1100 * Move `Output` classes to a separate file. * `config` also refactored to be inside `compiler`. * constants moved into their own file. * warnings context managers moved into the `utils` file commit 63ce813 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Wed Jan 3 19:59:13 2024 +1100 Updated output classes to more modern Python and improved some formatting. Also fixed a couple of bugs with error messages (not being raised, having incorrect text, etc.) commit 6e43872 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Wed Jan 3 16:31:23 2024 +1100 Moved core classes into their own files. Also moved some utils functions out of labscript.py. commit 994ccc6 Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Wed Jan 3 16:14:57 2024 +1100 Updated core device subclasses (`Pseudoclock`, `ClockLine`, `TriggerableDevice`, `IntermediateDevice`, etc.) to more modern Python and improved some formatting. Also fixed a bug in an error message. commit 461344e Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Dec 30 21:14:30 2023 +1100 Break out `Device` class into it's own file commit 5345e6d Author: philipstarkey <philipstarkey@users.noreply.github.com> Date: Sat Dec 30 21:11:48 2023 +1100 Initial work centered around refactoring the `Device` and `compiler` classes, and updating code to take advantage of more modern Python (3.6+) features.
Squashed commit of the following:
commit e2a992d028dd505b56eb5d84db8cc0c055221743
Author: David Meyer <dihm@users.noreply.github.com>
Date: Tue Aug 22 15:30:36 2023 -0400
Merge pull request #101 from dihm/dtype_hotfix
Fix bad np.array call in `Output.expand_timeseries`
commit 20577d18ab9276dee33e7a2c89787221580f10e0
Author: David Meyer <dihm@users.noreply.github.com>
Date: Wed Apr 12 21:35:18 2023 -0400
Merge pull request #89 from dihm/dds_gate_kwargs
Allow passthrough of other kwargs in DDS gate DigitalOut specification.
Squashed commit of the following: commit ed6b0eb Author: David Meyer <dihm@users.noreply.github.com> Date: Wed Apr 12 19:44:06 2023 -0400 Update python version support commit 326dd7b Merge: 2560991 72cefe9 Author: David Meyer <dihm@users.noreply.github.com> Date: Wed Apr 12 16:56:54 2023 -0400 Merge pull request #97 from dihm/update-workflow Sync workflow with current state of the art commit 72cefe9 Author: David Meyer <dihm@users.noreply.github.com> Date: Wed Apr 12 16:42:32 2023 -0400 Sync workflow with current state of the art
Squashed commit of the following: commit 82f2b7e Merge: 43d9901 727caf1 Author: David Meyer <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> Date: Wed Aug 3 13:22:55 2022 -0400 Bring workflow up to date with sandbox commit 43d9901 Merge: b67bc30 c48a1f2 Author: David Meyer <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> Date: Thu Jun 2 10:33:45 2022 -0400 Bump sphinx pin and update intersphinx links commit b67bc30 Merge: efa479a d554160 Author: Chris Billington <chrisjbillington@gmail.com> 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 <spielman@umd.edu> Date: Tue May 31 13:45:02 2022 -0400 Change default of save_hg_info to commit efa479a Merge: de6fb95 a9888d5 Author: David Meyer <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> 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 <philipstarkey@users.noreply.github.com> 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 <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> Date: Thu Feb 3 14:29:19 2022 -0500 Back to last known working zprocess version. commit 9294f98 Author: David Meyer <dihm@users.noreply.github.com> Date: Thu Feb 3 14:27:16 2022 -0500 Change pin back on more. commit d9b0cd0 Author: David Meyer <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> Date: Thu Feb 3 14:03:01 2022 -0500 Mock `labscript_utils` to prevent RTD from trying to launch zprocess.
Squashed commit of the following: commit f6409e0 Author: David Meyer <dihm@users.noreply.github.com> Date: Tue Dec 7 10:11:56 2021 -0500 Update setup.cfg to show python 3.9 support. commit 4d26344 Merge: 62455b5 deca5d8 Author: David Meyer <dihm@users.noreply.github.com> Date: Wed Nov 10 18:42:45 2021 -0500 Merge pull request #77 from zakv/square-wave Added AnalogQuantity.square_wave(). commit deca5d8 Author: Zak V <zakven@mit.edu> Date: Wed Nov 10 18:00:24 2021 -0500 Changed the parameterization of AnalogQuantity.square_wave() inputs, then added square_wave_levels() method which uses the old parameterization. This PR also inverts the previous meaning of duty cycle in the old parameterization. Now duty cycle is the fraction of the time spent outputing `level_0` rather than `level_1` in square_wave_levels(). commit 62455b5 Merge: 13239cc bda942a Author: David Meyer <dihm@users.noreply.github.com> Date: Wed Nov 10 08:53:04 2021 -0500 Merge pull request #84 from chrisjbillington/full-unitconversion-import-path Save the full import path of unit conversion classes commit bda942a Author: chrisjbillington <chrisjbillington@gmail.com> Date: Tue Nov 9 16:50:14 2021 +1100 Save the full import path of unit conversion classes This allows unit conversion classes located outside of `labscript_utils` to be used. Closes #71 commit 13239cc Merge: 83e10e5 4716ceb Author: zakv <4721629+zakv@users.noreply.github.com> Date: Fri Aug 20 16:48:15 2021 -0400 Merge pull request #72 from zakv/save-git-info Save git info commit 83e10e5 Merge: 9fbd24c ea17d77 Author: zakv <4721629+zakv@users.noreply.github.com> Date: Fri Aug 20 16:47:49 2021 -0400 Merge pull request #73 from philipstarkey/feature/performance-improvements Performance improvements commit 9fbd24c Merge: 04db899 736cb32 Author: zakv <4721629+zakv@users.noreply.github.com> Date: Fri Aug 20 08:33:57 2021 -0400 Merge pull request #79 from zakv/fix-78 Fix #78: labscript.py accidentally overwrites dedent() commit 04db899 Merge: a805b69 9915e50 Author: David Meyer <dihm@users.noreply.github.com> Date: Fri Jul 16 14:54:58 2021 -0400 Merge pull request #74 from dihm/labscript-docs Initial pass at API docs for labscript commit 9915e50 Author: David Meyer <dihm.meyer@gmail.com> Date: Thu Jul 15 10:17:58 2021 -0400 Even more docstring coverage in the API. commit a4057e5 Author: David Meyer <dihm.meyer@gmail.com> Date: Wed Jul 14 10:38:13 2021 -0400 Adding more docstrings to the API. commit 846377d Author: David Meyer <dihm.meyer@gmail.com> Date: Wed Jul 14 10:34:02 2021 -0400 Remove colorama stuff. Doesn't work on RTD anyway. Now everything will be more consistent. commit 073ceb4 Author: David Meyer <dihm.meyer@gmail.com> Date: Wed Jul 14 10:08:19 2021 -0400 Add missing dependency that sphinx should bring in automatically but doesn't on RTD. commit 08071b1 Author: David Meyer <dihm.meyer@gmail.com> Date: Wed Jul 14 09:51:36 2021 -0400 Update sphinx pin to newest stable version. commit 4b6f805 Author: David Meyer <dihm.meyer@gmail.com> Date: Wed Jul 14 09:41:26 2021 -0400 Quick hack to get a coverage percentage of the API documentation. We can't easily use the coverage extension because it counts things documented via the `undoc-members` flag as documented! Actual items that need documenting can also be printed if desired by setting the `undoc_print_objects` flag in conf.py. This is automatically done for RTD builds. commit 09091e3 Author: David Meyer <dihm.meyer@gmail.com> Date: Tue Jul 13 18:02:21 2021 -0400 Add docstrings for all of the defined functions. commit c1960c0 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Jul 9 11:45:36 2021 -0400 Clean up warning messages and dead code. commit b9be2c3 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Jul 9 11:23:00 2021 -0400 Version bump RTD theme. commit 7e086b6 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Apr 2 13:23:33 2021 -0400 Version bump sphinx build requirement to 3.2.1 commit 689bc40 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Apr 2 12:19:55 2021 -0400 Adding the connection diagram figure from Phil's thesis. commit f5b8eed Author: David Meyer <dihm.meyer@gmail.com> Date: Tue Nov 17 07:29:34 2020 -0500 Version bump sphinx to 3.1.2 This fixes issue where autodoc does not correctly handle decorated function signatures. commit 6512ac6 Author: David Meyer <dihm@users.noreply.github.com> Date: Mon Nov 16 20:17:19 2020 -0500 Version bump sphinx Fixes issue with using autosummary templates commit 0e91b09 Author: David Meyer <dihm.meyer@gmail.com> Date: Mon Nov 16 18:39:30 2020 -0500 Initial pass at API docs for labscript. This relies on recursive features and custom templates for autosummary, as described in https://stackoverflow.com/questions/2701998/sphinx-autodoc-is-not-automatic-enough/62613202#62613202 commit 736cb32 Author: Zak V <zakven@mit.edu> Date: Thu Feb 25 19:23:29 2021 -0500 Fixed issue 78 in which labscript.py accidentally overwrote labscript_utils.dedent() with matplotlib.cbook.dedent(). commit 054e281 Author: Zak V <zakven@mit.edu> Date: Thu Feb 25 18:40:41 2021 -0500 Added AnalogQuantity.square_wave(). commit 4716ceb Author: Zak V <zakven@mit.edu> Date: Thu Oct 15 05:47:31 2020 -0400 Reduced _vcs_cache_rlock contention in save_labscripts(). commit ea17d77 Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Thu Oct 15 18:50:45 2020 +1100 Performance improvements These small changes seem to improve compilation time significantly. Tests (done with saving of hg info disabled) indicate compilation time for a complex experiment is decreased somewhere between 25-33%. commit 903cc43 Author: Zak V <zakven@mit.edu> Date: Wed Oct 14 03:59:16 2020 -0400 Worked on some thread safety issues with vcs caching. commit 0f3f187 Author: Zak V <zakven@mit.edu> Date: Tue Oct 13 02:01:49 2020 -0400 Results from git/hg are now cached for faster shot compilation. commit 6022d97 Author: Zak V <zakven@mit.edu> Date: Sun Oct 4 12:52:10 2020 -0400 Added '--tags' to call to git describe. commit 2025755 Author: Zak V <zakven@mit.edu> Date: Sun Oct 4 12:38:10 2020 -0400 Updated git/hg error message. commit dc8d917 Author: Zak V <zakven@mit.edu> Date: Sun Oct 4 12:35:39 2020 -0400 Added "git describe --always HEAD" to git commands. commit 9a20221 Author: Zak V <zakven@mit.edu> Date: Sun Oct 4 12:30:44 2020 -0400 Removed "--verify" from git rev-parse call. commit 58ed6db Author: Zak V <zakven@mit.edu> Date: Sun Oct 4 12:28:35 2020 -0400 save_labscripts()'s calls to git/hg for a given file now run in parallel. commit df4e17f Author: Zak V <zakven@mit.edu> Date: Sat Oct 3 14:35:59 2020 -0400 Added support for save_hg_info and save_git_info options in the labconfig [labscript] section. commit e0073ea Author: Zak V <zakven@mit.edu> Date: Sat Oct 3 13:48:15 2020 -0400 Added support for saving git repo info.
PreviousNext