Skip to content

Commit e6f3311

Browse files
committed
Squashed commit of the following:
commit 6c5181f2fa45b572c0366285bd9a09f5b363efc2 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 58c124a622e5db65d4bff3c2e03f83365e9bbef2 Author: David Meyer <dihm.meyer@gmail.com> Date: Fri Jul 12 17:15:52 2024 -0400 Fix typo in metadata commit 24c5b7a6af994e4ddd494fc2a6802fcb6ce1b0da 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 58505653fcdb1da50c1fb0dc3f6c7bd60029068e 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 4cd0cf319ec1a3a1ba7a8f4b53f0cd48c1030b92 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 87cab030f05562171984f3ad1470678a8ac90698 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 719460ec1936dc62942c4d85551c528941f7b789 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 3981efc6ce62a1678a9a853073b59d702e931ff1 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
1 parent f1a4cd6 commit e6f3311

20 files changed

+4598
-3363
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"
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)