Tags: ChinlabLiCsCode/blacs
Tags
Squashed commit of the following: commit d30739da328301cff1f0118c19f7d076b38d7628 Author: David Meyer <[email protected]> Date: Fri Apr 11 13:39:06 2025 -0400 Merge pull request labscript-suite#108 from dihm/workflow_refresh Workflow refresh commit 3dd0df76623bb5cda36a43585b0749c097955ccf Author: David Meyer <[email protected]> Date: Mon Oct 21 11:15:12 2024 -0400 Merge pull request labscript-suite#107 from Json-To-String/master adding logic to handle KeyError: "Unable to open object (object 'connection table' doesn't exist)" on initial run commit 347d6bfc8c4f5e8c2775e336d505f896cb7fbdda Author: David Meyer <[email protected]> Date: Sat Jul 13 03:01:21 2024 -0400 Merge pull request labscript-suite#104 from dihm/metadata_overhaul Metadata overhaul
Squashed commit of the following: commit f9c1b0a1fbdde31f560022d8f6f62a7f6d9f8022 Author: David Meyer <[email protected]> Date: Fri Feb 9 13:38:37 2024 -0500 Merge pull request labscript-suite#103 from dihm/update_workflow Update workflow pins to use node.js=20 commit 4d1d4c1f32ade27faba0bb84868170eafc920f81 Author: David Meyer <[email protected]> Date: Fri Feb 9 13:38:24 2024 -0500 Merge pull request labscript-suite#102 from dihm/setuptools_scm_fix Ensure setuptools_scm uses `release-branch-semver` commit 57db7c055cb886b03a969436fc7013288097c32b Author: David Meyer <[email protected]> Date: Thu Jan 18 20:53:05 2024 -0500 Merge pull request labscript-suite#101 from dihm/rtd_builds Modernize RTD build
Squashed commit of the following: commit 5186769 Author: David Meyer <[email protected]> Date: Wed Apr 12 19:43:11 2023 -0400 Update python version support commit e508fcd Merge: 5e3603d 514e7d2 Author: David Meyer <[email protected]> Date: Wed Apr 12 19:38:50 2023 -0400 Merge pull request labscript-suite#98 from labscript-suite/qt-float-fix Only pass ints to self.ui.move commit 5e3603d Merge: fb8bcd9 79119b9 Author: David Meyer <[email protected]> Date: Wed Apr 12 16:56:39 2023 -0400 Merge pull request labscript-suite#99 from dihm/update-workflow Sync workflow with current state of the art commit 79119b9 Author: David Meyer <[email protected]> Date: Wed Apr 12 16:44:29 2023 -0400 Sync workflow with current state of the art commit 514e7d2 Author: chrisjbillington <[email protected]> Date: Sat Apr 8 21:11:43 2023 +1000 Only pass ints to self.ui.move as floats to QWidget.move are depreceated and raise an exception. Also update the log line to print the full exception for easier detection of issues in the future. commit fb8bcd9 Merge: 6f7a653 2e6d140 Author: David Meyer <[email protected]> Date: Tue Jan 3 12:07:48 2023 -0500 Merge pull request labscript-suite#91 from labscript-suite/ipv6-remotes Correctly parse ipv6 host:port for remote workers commit 6f7a653 Merge: 75ef861 cb87bc7 Author: David Meyer <[email protected]> Date: Fri Aug 5 16:45:25 2022 -0400 Merge pull request labscript-suite#96 from dihm/update-workflow Bring workflow up to date with sandbox commit cb87bc7 Author: David Meyer <[email protected]> Date: Wed Aug 3 13:24:26 2022 -0400 Bring workflow up to date with sandbox commit 75ef861 Merge: 8551005 029c3b6 Author: David Meyer <[email protected]> Date: Thu Jun 2 10:52:25 2022 -0400 Merge pull request labscript-suite#95 from dihm/fix_docs_build Bump sphinx version and update intersphinx links commit 029c3b6 Author: David Meyer <[email protected]> Date: Thu Jun 2 10:38:46 2022 -0400 Bump sphinx version and update intersphinx links commit 8551005 Merge: 84731bb cea8ca1 Author: Chris Billington <[email protected]> Date: Sun May 1 22:44:25 2022 +1000 Merge pull request labscript-suite#93 from dihm/datetime Upgrade 'run time' to datetime timestamp. commit cea8ca1 Author: David Meyer <[email protected]> Date: Sat Apr 30 02:09:32 2022 -0400 Upgrade 'run time' to datetime timestamp. This gives the saved 'run time' resolution better than 1 second. commit 2e6d140 Author: chrisjbillington <[email protected]> Date: Sat Jan 29 12:58:52 2022 +1100 Correctly parse ipv6 host:port for remote workers IPv6 addresses contain colons, so we need to split only on the last colon. Zprocess currently has ipv6 disabled by default, but it will be enabled in the next release.
Squashed commit of the following: commit c054099 Author: David Meyer <[email protected]> Date: Tue Dec 7 10:26:22 2021 -0500 Update setup.cfg to show python 3.9 support commit d1ee324 Merge: dbeccbc ce11661 Author: David Meyer <[email protected]> Date: Tue Nov 30 12:42:32 2021 -0500 Merge pull request labscript-suite#79 from philipstarkey/break-circular-dependency Updated BLACS to use the new labscript-utils device registry. commit ce11661 Merge: 741d790 dbeccbc Author: David Meyer <[email protected]> Date: Tue Nov 30 12:39:25 2021 -0500 Merge branch 'master' into break-circular-dependency commit dbeccbc Merge: 641cdeb 7f9552a Author: David Meyer <[email protected]> Date: Wed Nov 24 11:22:29 2021 -0500 Merge pull request labscript-suite#87 from zakv/fix-86 Fixed issue where blacs couldn't close with certain tabs commit 641cdeb Merge: e8bdd1b ff6f447 Author: David Meyer <[email protected]> Date: Wed Nov 10 16:57:14 2021 -0500 Merge pull request labscript-suite#81 from zakv/conversion-import-error Fix Bug in AO.__init__() When Unit Conversion Import Fails commit e8bdd1b Merge: b083bb8 868b991 Author: David Meyer <[email protected]> Date: Fri Jul 16 16:06:03 2021 -0400 Merge pull request labscript-suite#80 from dihm/blacs-docs Initial pass at BLACS docs commit 868b991 Author: David Meyer <[email protected]> Date: Thu Jul 15 10:37:40 2021 -0400 Add docstring coverage check to build. commit ce2c490 Author: David Meyer <[email protected]> Date: Thu Jul 15 10:37:15 2021 -0400 Update sphinx pin. commit a3e6040 Author: David Meyer <[email protected]> Date: Fri Jul 9 12:05:25 2021 -0400 Add unlisted dependency in `compile_and_restart` on runmanager. commit 2c0ec0c Author: David Meyer <[email protected]> Date: Fri Jul 9 11:57:36 2021 -0400 Add missing import to conf.py commit 03a53e2 Author: David Meyer <[email protected]> Date: Fri Jul 9 11:55:06 2021 -0400 Add API documentation for the BLACS GUI. commit 869d28f Author: David Meyer <[email protected]> Date: Fri Jul 9 11:52:38 2021 -0400 Version bump sphinx to match rest of modules. commit 06539c4 Author: David Meyer <[email protected]> Date: Tue Nov 17 19:41:19 2020 -0500 Updating high level docs from @philipstarkey Thesis. commit d542c2f Author: David Meyer <[email protected]> Date: Tue Nov 17 17:27:25 2020 -0500 Add API documentation for the blacs submodules. Relies on recursive autosummary and a custom template. In testing builds, noticed that experiment_queue and plugins depended on a properly set up labconfig; namely experiment_shot_storage. Might be an issue on readthedocs. commit 057d849 Author: David Meyer <[email protected]> Date: Tue Nov 17 17:03:41 2020 -0500 Add pyqt5 intersphinx inventory. commit b083bb8 Merge: 2bd2aa6 3930ffc Author: chrisjbillington <[email protected]> Date: Fri Apr 9 12:27:24 2021 +1000 Merge branch 'dihm/setuptools_scm-fix' commit 3930ffc Author: chrisjbillington <[email protected]> Date: Fri Apr 9 12:26:48 2021 +1000 * Continue to set local scheme based on env var in `__version__.py` for consistency. * Don't require specific setuptools or [toml] extra from setuptools_scm. We aren't configuring setuptools_scm in pyproject.toml anyway, and setuptools_scm itself will specify a fairly recent version of setuptools (we have no special requirement ourselves) * no longer use env var for version_scheme in setup.py, since we're now hard-coding release-branch-semver. commit 75b10aa Author: David Meyer <[email protected]> Date: Fri Apr 2 13:50:25 2021 -0400 Update setup.cfg Adds setuptools-scm with required version. commit feff404 Author: David Meyer <[email protected]> Date: Tue Dec 29 14:22:20 2020 -0500 Update default setuptools_scm version scheme to release-branch-semver. This fixes the circular dependency issue between blacs and labscript-devices. commit 7f9552a Author: Zak V <[email protected]> Date: Fri Jan 15 08:23:51 2021 -0500 Fixed issue where blacs couldn't close if a tab doesn't have shutdown_workers() and finalise_close_tab() methods. In particular, PluginTab doesn't have these methods. commit 2bd2aa6 Merge: 0e153f2 ca203a4 Author: Chris Billington <[email protected]> Date: Tue Jan 5 13:55:02 2021 +1100 Merge pull request labscript-suite#85 from zakv/fix-84 Fix copy/paste bug where stop_order is set to start_order commit ca203a4 Author: Zak V <[email protected]> Date: Mon Jan 4 21:16:06 2021 -0500 Fixed copy/paste bug where stop_order was set to start_order in QueueManager.manage(). commit ff6f447 Author: Zak V <[email protected]> Date: Tue Nov 24 17:30:12 2020 -0500 Corrected mistaken change to AO.__init__() error message in previous commit. commit e0a615a Author: Zak V <[email protected]> Date: Tue Nov 24 16:54:22 2020 -0500 Fixed bug in AO.__init__() where failure to import a unit conversion class wasn't reported correctly, causing "AttributeError: 'NoneType' object has no attribute 'base_unit'". commit 741d790 Author: philipstarkey <[email protected]> Date: Thu Jul 16 17:17:02 2020 +1000 Updated BLACS to use the new labscript-utils device registry. Removes the circular dependency on labscript-devices. This update assumes we will publish a new labscript-utils beta (3.1.0b1) shortly (so will fail to build on RTD until that is done)
Merge pull request labscript-suite#83 from chrisjbillington/master Do not use deprecated set-env command in workflow
PreviousNext