Skip to content

Commit 9d7ce7a

Browse files
committed
Squashed commit of the following:
commit c78247b Merge: ce3506b fa5ff21 Author: David Meyer <dihm@users.noreply.github.com> Date: Wed Dec 10 11:58:56 2025 -0500 Merge pull request #132 from Json-To-String/prawn-device-updates Prawn device updates commit fa5ff21 Author: Jason Pruitt <pruitt.jason8164@gmail.com> Date: Wed Dec 10 11:52:43 2025 -0500 Add a status readout at initialization to the PB to match DO commit 7d04da7 Author: Jason Pruitt <pruitt.jason8164@gmail.com> Date: Wed Dec 10 09:38:26 2025 -0500 Swap assert for LabscriptError, separate board checking and version logic commit ee9756d Author: Jason Pruitt <pruitt.jason8164@gmail.com> Date: Tue Dec 9 14:53:26 2025 -0500 Check to see if board specified in connection table matches board response from firmware commit 654c339 Author: Jason Pruitt <pruitt.jason8164@gmail.com> Date: Tue Dec 9 14:23:12 2025 -0500 Remove blaster fast serial check in favor of min version to insist on upgrade commit 8899250 Author: Jason Pruitt <pruitt.jason8164@gmail.com> Date: Tue Dec 9 14:19:58 2025 -0500 Add min version to prawnblaster to match prawndo check commit a922f91 Author: Jason Pruitt <pruitt.jason8164@gmail.com> Date: Tue Dec 9 14:18:40 2025 -0500 Add version check for pico board num commit ce3506b Merge: 17aaa96 7a67842 Author: David Meyer <dihm@users.noreply.github.com> Date: Tue Nov 18 11:53:15 2025 -0500 Merge pull request #135 from rogding/issue_131 Changed np.string_ to np_bytes to work with numpy>=2.0 commit 7a67842 Author: David Meyer <dihm.meyer@gmail.com> Date: Tue Nov 18 11:47:40 2025 -0500 Remove deprecated `np.asfarray` function. commit 9fde1c0 Author: David Meyer <dihm.meyer@gmail.com> Date: Tue Nov 18 11:46:22 2025 -0500 Replace other `np.string_` references in the package. commit b40cf0d Author: rogding <rogding@users.noreply.github.com> Date: Sat Nov 15 20:19:05 2025 -0700 Changed np.string_ to np_bytes to work with numpy>=2 commit 17aaa96 Merge: e77cb11 d011ff2 Author: David Meyer <dihm@users.noreply.github.com> Date: Tue Aug 19 17:32:39 2025 -0400 Merge pull request #134 from dihm/sphinx_updates Sphinx fix commit d011ff2 Author: David Meyer <dihm.meyer@gmail.com> Date: Tue Aug 19 17:29:47 2025 -0400 Ensure intersphinx mapping does not include current project commit e77cb11 Merge: 7bc5bb6 3db188b Author: David Meyer <dihm@users.noreply.github.com> Date: Sun Aug 3 00:59:25 2025 -0400 Merge pull request #133 from dihm/sphinx_updates Update sphinx build and ensure RTD stable versioning is correct commit 3db188b Author: David Meyer <dihm@users.noreply.github.com> Date: Sun Aug 3 00:57:08 2025 -0400 Use correct mock for h5_lock, tweak makefiles, and fix cross-ref commit 61955bf Author: David Meyer <dihm@users.noreply.github.com> Date: Sun Aug 3 00:18:42 2025 -0400 Bump sphinx pins and fix RTD-stable versioning commit ec437c0 Author: Jason Pruitt <pruitt.jason8164@gmail.com> Date: Fri Jul 11 15:45:20 2025 -0400 Handle differences between pico1 and pico2 board capabilities commit 0e7e882 Author: Jason Pruitt <pruitt.jason8164@gmail.com> Date: Fri Jul 11 15:13:46 2025 -0400 Use dedicated send commands where possible commit 60e6180 Author: Jason Pruitt <pruitt.jason8164@gmail.com> Date: Mon Jul 7 15:18:19 2025 -0400 Add board awareness to devices for pico2 support commit 7bc5bb6 Merge: bdf982f 08ceee2 Author: David Meyer <dihm@users.noreply.github.com> Date: Mon Apr 21 13:15:07 2025 -0400 Merge pull request #128 from dihm/nt_docs DDS9m docs update commit 08ceee2 Author: David Meyer <dihm.meyer@gmail.com> Date: Mon Apr 21 12:26:55 2025 -0400 Add old blob documentation for the novatech dds9m, now that the blog is gone. commit bdf982f Merge: 5e71c14 f753003 Author: David Meyer <dihm@users.noreply.github.com> Date: Fri Apr 11 13:47:58 2025 -0400 Merge pull request #127 from dihm/workflow_refresh Workflow refresh commit f753003 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Apr 11 13:45:15 2025 -0400 Update readme link, project metadata, and dependencies commit 6dfc3d1 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Apr 11 13:44:59 2025 -0400 Update workflow to latest and greatest commit 5e71c14 Merge: 8b3b5ae 41c23b2 Author: David Meyer <dihm@users.noreply.github.com> Date: Tue Sep 3 14:49:33 2024 -0400 Merge pull request #115 from dihm/prawn_do PrawnDO commit 41c23b2 Author: David Meyer <dihm.meyer@gmail.com> Date: Tue Sep 3 14:26:25 2024 -0400 Update stale URLs in the docs commit adc1198 Author: David Meyer <dihm.meyer@gmail.com> Date: Tue Sep 3 14:16:49 2024 -0400 Add PrawnDO to project README as supported. commit 52cbbe9 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Aug 30 22:41:49 2024 -0400 Fix issues in `doXX` channel changeover commit 8b3b5ae Merge: dffa132 ac15deb Author: David Meyer <dihm@users.noreply.github.com> Date: Wed Aug 21 14:17:10 2024 -0400 Merge pull request #121 from philipstarkey/deprecate-pineblaster Mark PineBlaster as deprecated in documentation commit f2601a9 Author: David Meyer <dihm.meyer@gmail.com> Date: Tue Aug 20 15:06:56 2024 -0400 Solidify hardware channel specification to `'doX'`. This allows for correct auto widget creation. It also move specification out of hex to to decimal, matching the labeling of the GPIO pins. commit 4b81e70 Author: David Meyer <dihm.meyer@gmail.com> Date: Wed Aug 14 15:52:41 2024 -0400 Ensure `initial_trigger_time` is not modified when using the internal IntermediateDevice with a direct clockline trigger. commit 1b7ca5a Author: David Meyer <dihm.meyer@gmail.com> Date: Thu Aug 8 17:05:58 2024 -0400 Properly allow the BLACSTab to find child digital outputs. commit 7c74fd6 Author: David Meyer <dihm.meyer@gmail.com> Date: Thu Aug 8 16:50:11 2024 -0400 Fix imports commit ac15deb Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Sat Jul 27 15:44:36 2024 +1000 Mark PineBlaster as deprecated in documentation commit dffa132 Merge: 8c360af 9a358ec Author: David Meyer <dihm@users.noreply.github.com> Date: Sat Jul 13 21:36:34 2024 -0400 Merge pull request #116 from jacksulli/spinnaker_camera_changes Changed SpinnakerCamera StreamBufferCountMode commit 8c360af Merge: a025ccd e46630a Author: David Meyer <dihm@users.noreply.github.com> Date: Sat Jul 13 19:36:52 2024 -0400 Merge pull request #120 from dihm/metadata_overhaul Metadata overhaul commit e46630a Author: David Meyer <dihm.meyer@gmail.com> Date: Sat Jul 13 02:04:31 2024 -0400 Moves all metadata to pyproject.toml, updates setuptools-scm settings commit 9a358ec Author: jacksulli <85042471+jacksulli@users.noreply.github.com> Date: Sun Jul 7 12:04:49 2024 -0400 Updating buffer information Changed the StreamBufferHandling mode to OldestFirst, and the manual buffer count to 1 when taking a single snap. commit a025ccd Merge: fa8b457 fc3aeb9 Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Wed Jun 26 00:04:23 2024 +1000 Merge pull request #118 from ispielma/master TekScope bug fix commit fc3aeb9 Merge: 259ea85 fa8b457 Author: Ian B. Spielman <54444522+ispielma@users.noreply.github.com> Date: Tue Jun 25 09:30:40 2024 -0400 Merge branch 'labscript-suite:master' into master commit 259ea85 Author: spielman <spielman@umd.edu> Date: Tue Jun 25 09:29:49 2024 -0400 Move one object update out of the h5 block (for slight speedup if h5lock is blocking) and changed create_group to require_group to allow more than one process to work. commit 1774866 Author: jacksulli <85042471+jacksulli@users.noreply.github.com> Date: Wed Jun 19 11:53:27 2024 -0400 Changed SpinnakerCamera StreamBufferCountMode Previously, the buffer count mode for the Spinnaker Camera was set to Auto. This feature has been depreciated so I changed it to be manual, and manually set the buffer count. In the case where bufferCount == 1, I set it to 3 because the Spinnaker SDK mentioned that 3 was the minimum buffer count. commit fa8b457 Merge: 0945101 08874c9 Author: David Meyer <dihm@users.noreply.github.com> Date: Thu May 23 14:23:26 2024 -0400 Merge pull request #112 from carterturn/carterturn-prawnblaster-binary PrawnBlaster binary programming commit b830f0e Author: David Meyer <dihm.meyer@gmail.com> Date: Thu May 23 13:57:21 2024 -0400 Minor updates to the Prawnblaster docs. commit c154108 Author: David Meyer <dihm.meyer@gmail.com> Date: Thu May 23 13:56:59 2024 -0400 Add PrawnDO docs commit ce147e9 Author: David Meyer <dihm.meyer@gmail.com> Date: Thu May 23 13:53:27 2024 -0400 Add PrawnDO labscript device code for use with the PrawnDO digital output board. commit 08874c9 Author: Carter Turn <carterturn@tutanota.de> Date: Sun Apr 28 16:16:36 2024 -0400 Add "ready" check for device-side error handling commit a9b94fe Author: Carter Turn <carterturn@tutanota.de> Date: Thu Mar 7 09:12:50 2024 -0500 Cleanup version number acquisition and comparison code. commit 535e87d Author: Carter Turn <carterturn@tutanota.de> Date: Mon Feb 19 00:12:54 2024 -0500 Faster method for generating binary programming data stream commit 12b5794 Merge: dc50f3c 0945101 Author: Carter Turn <carterturn@tutanota.de> Date: Mon Feb 19 00:12:41 2024 -0500 Merge branch 'master' into carterturn-prawnblaster-binary commit dc50f3c Author: Carter Turn <carterturn@tutanota.de> Date: Mon Feb 19 00:11:04 2024 -0500 Add check for PrawnBlaster binary programming support (via version number) commit 0945101 Merge: 83cabf8 ef9e733 Author: David Meyer <dihm@users.noreply.github.com> Date: Fri Feb 9 13:15:32 2024 -0500 Merge pull request #114 from dihm/update_workflow Update workflow pins to use node.js=20 commit 83cabf8 Merge: a175d26 9c5d9db Author: David Meyer <dihm@users.noreply.github.com> Date: Fri Feb 9 13:14:37 2024 -0500 Merge pull request #113 from dihm/setuptools_scm_fix Ensure setuptools_scm uses `release-branch-semver` commit 9c5d9db Author: David Meyer <dihm@users.noreply.github.com> Date: Fri Feb 9 13:10:40 2024 -0500 Fix typo commit ef9e733 Author: David Meyer <dihm@users.noreply.github.com> Date: Fri Feb 9 13:09:42 2024 -0500 Update workflow pins to use node.js=20 commit e57a41d Author: David Meyer <dihm@users.noreply.github.com> Date: Fri Feb 9 13:07:52 2024 -0500 Ensure setuptools_scm uses `release-branch-semver` Update setuptools and setuptools_scm pin in the build commit c9b90b2 Author: Carter Turn <carterturn@tutanota.de> Date: Mon Feb 5 20:53:22 2024 -0500 Fix imports and typos commit 2d7a72c Author: Carter Turn <carterturn@tutanota.de> Date: Mon Feb 5 10:49:13 2024 -0500 Add ability to program prawnblaster via binary block command commit a175d26 Merge: 019dc2d 33871e1 Author: David Meyer <dihm@users.noreply.github.com> Date: Thu Jan 18 21:28:32 2024 -0500 Merge pull request #108 from dihm/get_shot_globals_depbreak Get shot globals dependency break commit 019dc2d Merge: e1f3d32 86c8566 Author: David Meyer <dihm@users.noreply.github.com> Date: Tue Jan 16 15:39:11 2024 -0500 Merge pull request #111 from dihm/update_RTD Fix deprecated config for RTD builds. commit 86c8566 Author: David Meyer <dihm@users.noreply.github.com> Date: Tue Jan 16 15:36:27 2024 -0500 Update docs dependencies. commit 67ead96 Author: David Meyer <dihm@users.noreply.github.com> Date: Tue Jan 16 15:34:35 2024 -0500 Update markdown parsing to MyST commit 9905aa3 Author: David Meyer <dihm@users.noreply.github.com> Date: Tue Jan 16 12:25:01 2024 -0500 Fix deprecated config for RTD builds. commit 33871e1 Author: David Meyer <dihm.meyer@gmail.com> Date: Thu Oct 12 16:26:41 2023 -0400 Change `runmanager.get_shot_globals` to `labscript_utils.shot_utils.get_shot_globals` commit 5171f65 Author: David Meyer <dihm.meyer@gmail.com> Date: Thu Oct 12 16:25:59 2023 -0400 Fix RTD builds
1 parent e1f3d32 commit 9d7ce7a

34 files changed

+1942
-338
lines changed

.github/workflows/release-vars.sh

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# This repository. PyPI and Anaconda test and release package uploads are only done if
2+
# the repository the workflow is running in matches this (i.e. is not a fork). Optional,
3+
# if not set, package uploads are skipped.
4+
export RELEASE_REPO="labscript-suite/labscript-devices"
5+
6+
# Username with which to upload conda packages. If not given, anaconda uploads are
7+
# skipped.
8+
export ANACONDA_USER="labscript-suite"
9+
10+
# Whether (true or false) to upload releases to PyPI, non-releases to Test PyPI,
11+
# releases to Anaconda, non-releases to Anaconda test label. Only used if the repository
12+
# the workflow is running in matches RELEASE_REPO, otherwise uploads are skipped.
13+
# Anaconda uploads require ANACONDA_USER be specified and ANACONDA_API_TOKEN secret be
14+
# set. Optional, all default to true.
15+
export PYPI_UPLOAD=""
16+
export TESTPYPI_UPLOAD=""
17+
export ANACONDA_UPLOAD=""
18+
export TEST_ANACONDA_UPLOAD=""
19+
20+
# Which Python version to use for pure wheel builds, sdists, and as the host Python for
21+
# cibuildwheel. Optional, defaults to the second-most recent minor Python version.
22+
export DEFAULT_PYTHON=""
23+
24+
# Comma-separated list of Python versions to build conda packages for. Only used if
25+
# HAS_ENV_MARKERS=true or PURE=false, otherwise a noarch conda package is built instead.
26+
# Optional, defaults to all non-end-of-life stable Python minor versions.
27+
export CONDA_PYTHONS=""
28+
29+
# Environment variable set in the envionment that `cibuildwheel` runs in instructing it
30+
# which Pythons to build for, as a space-separated list of specifiers in the format
31+
# specified by `cibuildwheel`. Only used if PURE=false. Optional, defaults to all
32+
# non-end-of-life stable CPython versions.
33+
export CIBW_BUILD=""
34+
35+
# Name of Python package. Optional, defaults to name from the package metadata
36+
export PKGNAME=""
37+
38+
# Version of Python package. Optional, defaults to version from the package metadata
39+
export PKGVER=""
40+
41+
# Whether the Python package is pure (true) or impure (false). Optional, defaults to
42+
# false if the setuptools package has extension modules or libraries, otherwise true.
43+
export PURE=""
44+
45+
# Whether (true or false) the Python package has dependencies that vary by platform or
46+
# Python version. Optional, Defaults to presence of env markers in package metadata.
47+
export HAS_ENV_MARKERS=""

0 commit comments

Comments
 (0)