Skip to content

Commit 7534801

Browse files
dihmdihm
committed
Squashed commit of the following:
commit a79d0e4 Author: David Meyer <dihm@users.noreply.github.com> Date: Tue Nov 30 11:20:27 2021 -0500 Update setup.cfg in preparation for release. commit 811b43d Merge: b8726ad a3be0db Author: David Meyer <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> 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 <zakven@mit.edu> 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 <zakven@mit.edu> 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 <zakven@mit.edu> 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 <zakven@mit.edu> 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 <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> 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 <chrisjbillington@gmail.com> 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 <dihm@users.noreply.github.com> 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 <dihm@users.noreply.github.com> 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 <dihm.meyer@gmail.com> Date: Thu Jul 15 10:26:41 2021 -0400 Add docstring coverage test to build. commit f90a4cc Author: David Meyer <dihm.meyer@gmail.com> Date: Thu Jul 15 10:26:26 2021 -0400 Update sphinx version. commit e45107d Author: David Meyer <dihm.meyer@gmail.com> 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 <dihm.meyer@gmail.com> 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 <chrisjbillington@gmail.com> 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 <zakven@mit.edu> Date: Mon Feb 8 13:30:47 2021 -0500 Removed some python 2 debugging print statements from toolpalette.py. commit d9eb80f Author: Zak V <zakven@mit.edu> 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 <chrisjbillington@gmail.com> 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 <chrisjbillington@gmail.com> Date: Mon Jan 4 13:40:14 2021 +1100 Do not use deprecated set-env command commit b149e19 Author: Zak V <zakven@mit.edu> 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

40 files changed

+290
-437
lines changed

‎.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ jobs:
110110
else
111111
CONDA_BUILD_ARGS=""
112112
fi
113-
echo "::set-env name=CONDA_INSTALLER::$CONDA_INSTALLER"
114-
echo "::set-env name=CONDA_BUILD_ARGS::$CONDA_BUILD_ARGS"
113+
echo "CONDA_INSTALLER=$CONDA_INSTALLER" >> $GITHUB_ENV
114+
echo "CONDA_BUILD_ARGS=$CONDA_BUILD_ARGS" >> $GITHUB_ENV
115115
116116
- name: Conda package (Unix)
117117
if: runner.os != 'Windows'
@@ -210,7 +210,7 @@ jobs:
210210
if: github.event.ref_type == 'tag'
211211
run: |
212212
VERSION="${GITHUB_REF/refs\/tags\/v/}"
213-
echo "::set-env name=VERSION::$VERSION"
213+
echo "VERSION=$VERSION" >> $GITHUB_ENV
214214
215215
- name: Create GitHub Release
216216
if: github.event.ref_type == 'tag'

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,5 @@ conda_packages/
158158
# Sphinx documentation
159159
docs/html/
160160
docs/source/_build/
161-
docs/source/components.rst
161+
docs/source/components.rst
162+
docs/source/api/_autosummary

‎docs/source/_templates/autosummary-class.rst

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{{ fullname | escape | underline}}
2+
3+
.. currentmodule:: {{ module }}
4+
5+
.. autoclass:: {{ objname }}
6+
:members:
7+
:undoc-members:
8+
:show-inheritance:
9+
10+
{% block methods %}
11+
.. automethod:: __init__
12+
13+
{% if methods %}
14+
.. rubric:: {{ _('Methods') }}
15+
16+
.. autosummary::
17+
{% for item in methods %}
18+
~{{ name }}.{{ item }}
19+
{%- endfor %}
20+
{% endif %}
21+
{% endblock %}
22+
23+
{% block attributes %}
24+
{% if attributes %}
25+
.. rubric:: {{ _('Attributes') }}
26+
27+
.. autosummary::
28+
{% for item in attributes %}
29+
~{{ name }}.{{ item }}
30+
{%- endfor %}
31+
{% endif %}
32+
{% endblock %}

‎docs/source/_templates/autosummary-module.rst

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{{ fullname | escape | underline}}
2+
3+
{% block submodules %}
4+
{% if modules %}
5+
.. rubric:: {{ _('Sub-Modules') }}
6+
.. autosummary::
7+
:toctree:
8+
:template: autosummary-module.rst
9+
:recursive:
10+
11+
{% for item in modules %}
12+
{{ item }}
13+
{%- endfor %}
14+
{% endif %}
15+
{% endblock %}
16+
17+
.. automodule:: {{ fullname }}
18+
19+
{% block attributes %}
20+
{% if attributes %}
21+
.. rubric:: {{ _('Module Attributes') }}
22+
23+
.. autosummary::
24+
:toctree:
25+
{% for item in attributes %}
26+
{{ item }}
27+
{%- endfor %}
28+
{% endif %}
29+
{% endblock %}
30+
31+
{% block functions %}
32+
{% if functions %}
33+
.. rubric:: {{ _('Functions') }}
34+
35+
.. autosummary::
36+
:toctree:
37+
{% for item in functions %}
38+
{{ item }}
39+
{%- endfor %}
40+
{% endif %}
41+
{% endblock %}
42+
43+
{% block classes %}
44+
{% if classes %}
45+
.. rubric:: {{ _('Classes') }}
46+
47+
.. autosummary::
48+
:toctree:
49+
:template: autosummary-class.rst
50+
{% for item in classes %}
51+
{{ item }}
52+
{%- endfor %}
53+
{% endif %}
54+
{% endblock %}
55+
56+
{% block exceptions %}
57+
{% if exceptions %}
58+
.. rubric:: {{ _('Exceptions') }}
59+
60+
.. autosummary::
61+
:toctree:
62+
{% for item in exceptions %}
63+
{{ item }}
64+
{%- endfor %}
65+
{% endif %}
66+
{% endblock %}

‎docs/source/api/connections.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/source/api/dict_diff.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/source/api/double_import_denier.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/source/api/filewatcher.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/source/api/h5_lock.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/source/api/impprof.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/source/api/index.rst

Lines changed: 5 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,10 @@
22
API Reference
33
*************
44

5-
Labscript Tools
6-
~~~~~~~~~~~~~~~
7-
8-
.. toctree::
9-
:maxdepth: 2
5+
.. autosummary::
6+
:toctree: _autosummary
7+
:template: autosummary-module.rst
8+
:recursive:
109

1110
labscript_utils
12-
connections
13-
dict_diff
14-
labconfig
15-
settings
16-
testing_utils
17-
properties
18-
unitconversions
19-
20-
Communications
21-
~~~~~~~~~~~~~~
22-
23-
.. toctree::
24-
:maxdepth: 2
25-
26-
h5_lock
27-
ls_zprocess
28-
remote
29-
shared_drive
30-
zlock
31-
zlog
32-
33-
GUI
34-
~~~~
35-
36-
.. toctree::
37-
:maxdepth: 2
38-
39-
splash
40-
qtwidgets
41-
42-
Logging and Profiling
43-
~~~~~~~~~~~~~~~~~~~~~
44-
45-
.. toctree::
46-
:maxdepth: 2
47-
48-
impprof
49-
memprof
50-
setup_logging
51-
tracelog
52-
53-
54-
Module and File Tools
55-
~~~~~~~~~~~~~~~~~~~~~
56-
57-
.. toctree::
58-
:maxdepth: 2
59-
60-
double_import_denier
61-
filewatcher
62-
modulewatcher
63-
versions
11+
labscript_profile

‎docs/source/api/labconfig.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/source/api/labscript_utils.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎docs/source/api/ls_zprocess.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/source/api/memprof.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/source/api/modulewatcher.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/source/api/properties.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/source/api/qtwidgets.rst

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)