Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ChinlabLiCsCode/labscript
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: labscript-suite/labscript
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 2 files changed
  • 5 contributors

Commits on Dec 2, 2025

  1. Ignore PySide6 ephemeral imports from zip that linger in sys.modules as

    being in the labscript-suite profile path.
    
    Implemented as a simple string filter for common component names.
    dihm committed Dec 2, 2025
    Configuration menu
    Copy the full SHA
    8c5e165 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2025

  1. fix: set 0 as default max_BLACS_conn_length

    - Set the default value of `max_BLACS_conn_length` to 0 so that the
    `np.empty` always receives a valid arguement
    - Fixes labscript-suite#118
    YinFengQi committed Dec 12, 2025
    Configuration menu
    Copy the full SHA
    ac0c633 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2026

  1. add attribute BLACS_connection to class Device

    - Define the attribute `BLACS_connection` in base class `Device`, to
    ensure that all `Device` subclasses have this attribute.
    
    Suggested-by: @dihm
    YinFengQi committed Jan 18, 2026
    Configuration menu
    Copy the full SHA
    32e46d9 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2026

  1. Configuration menu
    Copy the full SHA
    0248d55 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2026

  1. Merge pull request labscript-suite#119 from YinFengQi/fix-#118

    fix: set 0 as default `max_BLACS_conn_length`
    dihm authored Mar 16, 2026
    Configuration menu
    Copy the full SHA
    fa22b43 View commit details
    Browse the repository at this point in the history
  2. Fix build and release workflow.

    dihm committed Mar 16, 2026
    Configuration menu
    Copy the full SHA
    2145dbf View commit details
    Browse the repository at this point in the history
  3. Merge pull request labscript-suite#117 from dihm/pyside6_fix

    Ignore PySide6 import objects in CWD when saving labscript files on compilation
    dihm authored Mar 16, 2026
    Configuration menu
    Copy the full SHA
    7a12be5 View commit details
    Browse the repository at this point in the history
  4. Merge pull request labscript-suite#121 from Json-To-String/variable-n…

    …ame-bug
    
    Remove try except for variable checking in favor of string.isidentifi…
    dihm authored Mar 16, 2026
    Configuration menu
    Copy the full SHA
    df53903 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2026

  1. Don't have all devices have a BLACS_connection

    Setting this in the base class creates ordering requirements for when
    subclasses call the base class `__init__` in order for their
    `BLACS_connection` not to be overridden.
    
    Simplify connection table string length calculation by just using
    variable length strings for all fields (except for the name field)
    
    Connection table reading code in `labscript_utils/connections.py`, does
    not rely on these being fixed-length `numpy` strings. Unless code is
    explicitly checking the dtype, it can't tell the difference and gets
    back bytestrings.
    
    There is a bug in labscript_utils/properties where code being too
    clever *does* (unnecessarily) check the dtype of the name field
    explicitly in order to be compatible with either fixed or
    variable-length strings, but this is done correctly and will crash on
    actual vlen strings. This check should be removed, but we should leave
    the name field fixed-length so that existing installations with the bug
    can still read the files created by newer labscript versions.
    chrisjbillington committed Mar 20, 2026
    Configuration menu
    Copy the full SHA
    2b8c2a2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request labscript-suite#122 from labscript-suite/blacs-con…

    …nection-bug
    
    Don't have all devices have a BLACS_connection
    dihm authored Mar 20, 2026
    Configuration menu
    Copy the full SHA
    a0787c4 View commit details
    Browse the repository at this point in the history
Loading