Commit 7534801
committed
Squashed commit of the following:
commit a79d0e4
Author: David Meyer <[email protected]>
Date: Tue Nov 30 11:20:27 2021 -0500
Update setup.cfg in preparation for release.
commit 811b43d
Merge: b8726ad a3be0db
Author: David Meyer <[email protected]>
Date: Wed Nov 10 17:07:51 2021 -0500
Merge pull request #81 from chrisjbillington/py36-path-bug
Fix bug on Python3.6
commit b8726ad
Merge: d309a5f c4dd2a8
Author: David Meyer <[email protected]>
Date: Wed Nov 10 17:06:47 2021 -0500
Merge pull request #78 from zakv/setup-logging-jupyter
Make setup_logging() more Jupyter-friendly.
commit d309a5f
Merge: d5dfea7 12db878
Author: David Meyer <[email protected]>
Date: Wed Nov 10 17:06:02 2021 -0500
Merge pull request #82 from dihm/zlog_port_profile
Add default zlog port to default profile configuration file.
commit c4dd2a8
Author: Zak V <[email protected]>
Date: Tue Nov 9 20:12:19 2021 -0500
Removed duplicate call to sys.stdout.fileno() in setup_logging.setup_logging().
Probably best practice to call it just once rather than calling it first to check if it raises an error then again later to actually use the value it returns.
commit 2e38107
Author: Zak V <[email protected]>
Date: Tue Nov 9 20:04:37 2021 -0500
Restructured try/except block in setup_logging.setup_logging() to avoid catching any UnsupportedOperation errors thrown by code other than sys.stdout.fileno().
commit 97e70c7
Author: Zak V <[email protected]>
Date: Tue Nov 9 19:56:07 2021 -0500
Added warning message when setup_logging.setup_logging() cannot send output to stdout and stderr.
commit b711923
Author: Zak V <[email protected]>
Date: Mon Jun 7 17:48:41 2021 -0400
setup_logging.py is now more Jupyter-friendly.
commit d5dfea7
Merge: 9b76dcb b149e19
Author: David Meyer <[email protected]>
Date: Wed Nov 10 08:54:21 2021 -0500
Merge pull request #74 from zakv/unitconversions-import-bugfix
Fixed bug in unitconversions._All._import_all()
commit 12db878
Author: David Meyer <[email protected]>
Date: Mon Nov 8 10:20:28 2021 -0500
Add default zlog port to default profile configuration file.
commit 9b76dcb
Merge: e13c992 e5cf3fb
Author: David Meyer <[email protected]>
Date: Fri Oct 22 17:53:17 2021 -0400
Merge pull request #80 from dihm/default_labconfig_docs
Add default labconfig file to docs
commit a3be0db
Author: chrisjbillington <[email protected]>
Date: Tue Sep 21 13:45:13 2021 +1000
Fix bug on Python3.6, where Path object not able to be treated as a
string in ConfigParser.
commit e5cf3fb
Author: David Meyer <[email protected]>
Date: Tue Aug 31 15:29:45 2021 -0400
Create a doc page that displays the current default labconfig.ini file,
for easy reference.
commit e13c992
Merge: e74472c 461dc9f
Author: David Meyer <[email protected]>
Date: Fri Jul 16 15:12:37 2021 -0400
Merge pull request #79 from dihm/labscript_utils-docs
Update docs to match autogenerating templates used in other modules of labscript.
commit 461dc9f
Author: David Meyer <[email protected]>
Date: Thu Jul 15 10:26:41 2021 -0400
Add docstring coverage test to build.
commit f90a4cc
Author: David Meyer <[email protected]>
Date: Thu Jul 15 10:26:26 2021 -0400
Update sphinx version.
commit e45107d
Author: David Meyer <[email protected]>
Date: Mon Jul 12 12:57:18 2021 -0400
Converting docs build to fully automated version based on recursive
autosummary calls.
This more closely resembles how docs are built in the other modules,
but is slightly different in that submodules are also recursively generated.
commit 56d64f7
Author: David Meyer <[email protected]>
Date: Mon Jul 12 09:25:18 2021 -0400
Update sphinx pins to same versions as rest of suite.
commit e74472c
Merge: f0999f5 c543328
Author: Chris Billington <[email protected]>
Date: Tue Feb 9 08:54:16 2021 +1100
Merge pull request #76 from zakv/fix-27
Work around infinite recursion in ToolPalette.resizeEvent()
commit c543328
Author: Zak V <[email protected]>
Date: Mon Feb 8 13:30:47 2021 -0500
Removed some python 2 debugging print statements from toolpalette.py.
commit d9eb80f
Author: Zak V <[email protected]>
Date: Sun Feb 7 23:44:47 2021 -0500
Fixed #27; worked around bug where ToolPalette.resizeEvent() could trigger itself in an infinite resursion loop.
commit f0999f5
Merge: 8371585 7d14b65
Author: Chris Billington <[email protected]>
Date: Mon Jan 4 13:46:54 2021 +1100
Merge pull request #75 from chrisjbillington/master
Do not use deprecated set-env command
commit 7d14b65
Author: chrisjbillington <[email protected]>
Date: Mon Jan 4 13:40:14 2021 +1100
Do not use deprecated set-env command
commit b149e19
Author: Zak V <[email protected]>
Date: Tue Nov 24 18:06:11 2020 -0500
Fixed bug in unitconversions._All._import_all() where self.__all__ wasn't always changed from None to an empty list before appending things to it.1 parent 8371585 commit 7534801
File tree
40 files changed
+290
-437
lines changed- .github/workflows
- docs/source
- _templates
- api
- labscript_profile
- default_profile/labconfig
- labscript_utils
- qtwidgets
- unitconversions
40 files changed
+290
-437
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
113 | | - | |
114 | | - | |
| 113 | + | |
| 114 | + | |
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
| |||
210 | 210 | | |
211 | 211 | | |
212 | 212 | | |
213 | | - | |
| 213 | + | |
214 | 214 | | |
215 | 215 | | |
216 | 216 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
161 | | - | |
| 161 | + | |
| 162 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
0 commit comments