Updated PR as per review in labscript-suite/labscript-suite#48

Author: philipstarkey

.gitignore

@@ -1,3 +1,10 @@
+# This gitignore file consists of 2 parts:
+#   * The standard Python .gitignore rules from GitHub
+#   * custom ignore rules for the labscript suite.
+#
+# These should be kept separate so that the generic rules can be updated with a
+# copy/paste without having to worry about whether we are removing custom rules
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -130,6 +137,10 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
+#
+# Custom labscript suite .gitignore rules start below
+#
+
 # Editors
 .vscode/
 

docs/source/_static/custom.css

@@ -57,3 +57,7 @@ details {
         0px 8px 10px 1px rgba(0, 0, 0, 0.14), 0px 3px 14px 2px rgba(0, 0, 0, 0.12);
     margin-bottom: 24px;
 }
+
+img.labscript-suite-icon {
+    min-width: 32px;
+}

docs/source/components.rst

@@ -0,0 +1,80 @@
+
+.. toctree::
+    :maxdepth: 2
+    :hidden:
+
+    Metapackage documentation <https://docs.labscriptsuite.org/en/latest/>
+
+
+*labscript suite* components
+============================
+
+The *labscript suite* is modular by design, and is comprised of:
+
+.. list-table:: Python libraries
+    :widths: 10 90
+    :header-rows: 0
+
+    * - .. image:: img/labscript_32nx32n.svg
+             :target: https://docs.labscriptsuite.org/projects/labscript/en/latest/
+             :class: labscript-suite-icon
+      - |labscript|_ --- Expressive composition of hardware-timed experiments
+    * - .. image:: img/labscript_32nx32n.svg
+             :target: https://docs.labscriptsuite.org/projects/labscript-devices/en/latest/
+             :class: labscript-suite-icon
+      - |labscript-devices|_ --- Plugin architecture for controlling experiment hardware
+    * - .. image:: img/labscript_32nx32n.svg
+             :target: https://docs.labscriptsuite.org/projects/labscript-utils/en/latest/
+             :class: labscript-suite-icon
+      - |labscript-utils|_ --- Shared modules used by the *labscript suite*
+
+
+.. list-table:: Graphical applications
+    :widths: 10 90
+    :header-rows: 0
+
+    * - .. image:: img/runmanager_32nx32n.svg
+             :target: https://docs.labscriptsuite.org/projects/runmanager/en/latest/
+             :class: labscript-suite-icon
+      - |runmanager|_ --- Graphical and remote interface to parameterized experiments
+    * - .. image:: img/blacs_32nx32n.svg
+             :target: https://docs.labscriptsuite.org/projects/blacs/en/latest/
+             :class: labscript-suite-icon
+      - |blacs|_ --- Graphical interface to scientific instruments and experiment supervision
+    * - .. image:: img/lyse_32nx32n.svg
+             :target: https://docs.labscriptsuite.org/projects/lyse/en/latest/
+             :class: labscript-suite-icon
+      - |lyse|_ --- Online analysis of live experiment data
+    * - .. image:: img/runviewer_32nx32n.svg
+             :target: https://docs.labscriptsuite.org/projects/runviewer/en/latest/
+             :class: labscript-suite-icon
+      - |runviewer|_ --- Visualize hardware-timed experiment instructions
+
+
+.. toctree::
+    :maxdepth: 2
+    :hidden:
+
+    blacs <https://docs.labscriptsuite.org/projects/blacs/en/latest/>
+    labscript <https://docs.labscriptsuite.org/projects/labscript/en/latest/>
+    labscript-devices <https://docs.labscriptsuite.org/projects/labscript-devices/en/latest/>
+    lyse <https://docs.labscriptsuite.org/projects/lyse/en/latest/>
+    runmanager <https://docs.labscriptsuite.org/projects/runmanager/en/latest/>
+    runviewer <https://docs.labscriptsuite.org/projects/runviewer/en/latest/>
+
+
+.. |labscript| replace:: **labscript**
+.. _labscript: https://docs.labscriptsuite.org/projects/labscript/en/latest/
+.. |labscript-devices| replace:: **labscript-devices**
+.. _labscript-devices: https://docs.labscriptsuite.org/projects/labscript-devices/en/latest/
+.. |labscript-utils| replace:: **labscript-utils**
+.. _labscript-utils: https://docs.labscriptsuite.org/projects/labscript-utils/en/latest/
+.. |runmanager| replace:: **runmanager**
+.. _runmanager: https://docs.labscriptsuite.org/projects/runmanager/en/latest/
+.. |blacs| replace:: **blacs**
+.. _blacs: https://docs.labscriptsuite.org/projects/blacs/en/latest/
+.. |lyse| replace:: **lyse**
+.. _lyse: https://docs.labscriptsuite.org/projects/lyse/en/latest/
+.. |runviewer| replace:: **runviewer**
+.. _runviewer: https://docs.labscriptsuite.org/projects/runviewer/en/latest/
+

docs/source/conf.py

@@ -11,6 +11,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+from pathlib import Path
 from m2r import MdInclude
 from recommonmark.transform import AutoStructify
 
@@ -26,8 +27,9 @@
 release = version
 
 # HTML icons
-html_logo = "img/{}.svg".format(project)
-html_favicon = "img/{}.ico".format(project)
+img_path = 'img'
+html_logo = img_path + "/labscript_64x64.svg"
+html_favicon = img_path + "/labscript.ico"
 
 # -- General configuration (should be identical across all projects) ------------------
 
@@ -90,18 +92,43 @@
 }
 
 # list of all labscript suite components that have docs
-labscript_suite_programs = [
-    'labscript',
-    'runmanager',
-    'runviewer',
-    'blacs',
-    'lyse',
-    'labscript-utils',
-    'labscript-devices',
-]
-# remove this current repo from the list
-if project in labscript_suite_programs:
-    labscript_suite_programs.remove(project)
+labscript_suite_programs = {
+    'labscript': {
+        'desc': 'Expressive composition of hardware-timed experiments',
+        'img': img_path + '/labscript_32nx32n.svg',
+        'type': 'lib',
+    },
+    'labscript-devices': {
+        'desc': 'Plugin architecture for controlling experiment hardware',
+        'img': img_path + '/labscript_32nx32n.svg',
+        'type': 'lib',
+    },
+    'labscript-utils': {
+        'desc': 'Shared modules used by the *labscript suite*',
+        'img': img_path + '/labscript_32nx32n.svg',
+        'type': 'lib',
+    },
+    'runmanager': {
+        'desc': 'Graphical and remote interface to parameterized experiments',
+        'img': img_path + '/runmanager_32nx32n.svg',
+        'type': 'gui',
+    },
+    'blacs': {
+        'desc': 'Graphical interface to scientific instruments and experiment supervision',
+        'img': img_path + '/blacs_32nx32n.svg',
+        'type': 'gui',
+    },
+    'lyse': {
+        'desc': 'Online analysis of live experiment data',
+        'img': img_path + '/lyse_32nx32n.svg',
+        'type': 'gui',
+    },
+    'runviewer': {
+        'desc': 'Visualize hardware-timed experiment instructions',
+        'img': img_path + '/runviewer_32nx32n.svg',
+        'type': 'gui',
+    },
+}
 
 # whether to use stable or latest version
 labscript_suite_doc_version = os.environ.get('READTHEDOCS_VERSION', 'latest')
@@ -111,7 +138,7 @@
 # add intersphinx references for each component
 for ls_prog in labscript_suite_programs:
     intersphinx_mapping[ls_prog] = (
-        'https://docs.labscript_suite.org/projects/{}/en/{}/'.format(
+        'https://docs.labscriptsuite.org/projects/{}/en/{}/'.format(
             ls_prog, labscript_suite_doc_version
         ),
         None,
@@ -120,7 +147,7 @@
 # add intersphinx reference for the metapackage
 if project != "the labscript suite":
     intersphinx_mapping['labscript-suite'] = (
-        'https://docs.labscript_suite.org/en/{}/'.format(labscript_suite_doc_version),
+        'https://docs.labscriptsuite.org/en/{}/'.format(labscript_suite_doc_version),
         None,
     )
 
@@ -160,6 +187,58 @@
 # Customize the html_theme
 html_theme_options = {'navigation_depth': 3}
 
+# Template for generating the components.rst file
+# fmt:off
+components_rst_template = \
+"""
+{metapackage_toctree}
+
+*labscript suite* components
+============================
+
+The *labscript suite* is modular by design, and is comprised of:
+
+.. list-table:: Python libraries
+    :widths: 10 90
+    :header-rows: 0
+
+{lib}
+
+.. list-table:: Graphical applications
+    :widths: 10 90
+    :header-rows: 0
+
+{gui}
+
+.. toctree::
+    :maxdepth: 2
+    :hidden:
+
+{toctree_entires}
+
+{rst_defs}
+"""
+
+components_rst_table_template = \
+"""    * - .. image:: {img}
+             :target: {target}
+             :class: labscript-suite-icon
+      - |{prog}|_ --- {desc}
+"""
+
+components_rst_link_template = \
+""".. |{prog}| replace:: **{prog}**
+.. _{prog}: {target}
+"""
+
+components_rst_metapackage_template = \
+""".. toctree::
+    :maxdepth: 2
+    :hidden:
+
+    Metapackage documentation <{}>
+"""
+# fmt:on
 
 # Use m2r only for mdinclude and recommonmark for everything else
 # https://github.com/readthedocs/recommonmark/issues/191#issuecomment-622369992
@@ -180,21 +259,45 @@ def setup(app):
     app.add_directive('mdinclude', MdInclude)
     app.add_stylesheet('custom.css')
 
-    with open(
-        os.path.join(os.path.dirname(os.path.realpath(__file__)), 'component_docs.rst'),
-        'w',
-    ) as f:
-        f.write("labscript suite components\n")
-        f.write("==========================\n")
-        f.write("    \n")
-        f.write(".. toctree::\n")
-        f.write("    :maxdepth: 2\n")
-        f.write("    \n")
-        if project != "the labscript suite":
-            f.write(
-                "    labscript suite (metapackage)<{}>\n".format(
-                    intersphinx_mapping['labscript-suite'][0]
-                )
+    # generate the components.rst file dynamically so it points to stable/latest
+    # of subprojects correctly
+    components_rst_table = {
+        "lib": "",
+        "gui": "",
+    }
+    components_rst_link = ""
+    components_rst_toctree = ""
+    components_rst_metapackage = ""
+    if project != 'the labscript suite':
+        components_rst_metapackage = components_rst_metapackage_template.format(
+            intersphinx_mapping['labscript-suite'][0]
+        )
+    metapackage_img = img_path + "/labscript-suite-rectangular-transparent_138nx70n.svg"
+    for ls_prog, data in labscript_suite_programs.items():
+        components_rst_table[data['type']] += components_rst_table_template.format(
+            prog=ls_prog,
+            labscript_suite_doc_version=labscript_suite_doc_version,
+            target=intersphinx_mapping[ls_prog][0],
+            **data
+        )
+        components_rst_link += components_rst_link_template.format(
+            prog=ls_prog,
+            labscript_suite_doc_version=labscript_suite_doc_version,
+            target=intersphinx_mapping[ls_prog][0],
+        )
+    for ls_prog in sorted(labscript_suite_programs):
+        if ls_prog != project:
+            components_rst_toctree += "    {} <{}>\n".format(
+                ls_prog, intersphinx_mapping[ls_prog][0]
             )
-        for ls_prog in labscript_suite_programs:
-            f.write("    {} <{}>\n".format(ls_prog, intersphinx_mapping[ls_prog][0]))
+
+    components_rst = components_rst_template.format(
+        toctree_entires=components_rst_toctree,
+        rst_defs=components_rst_link,
+        labscript_suite_doc_version=labscript_suite_doc_version,
+        metapackage_toctree=components_rst_metapackage,
+        **components_rst_table
+    )
+
+    with open(Path(__file__).resolve().parent / 'components.rst', 'w') as f:
+        f.write(components_rst)