Merge branch 'labscript-suite:master' into refactor

Author: ispielma

docs/Makefile

@@ -7,12 +7,18 @@ SPHINXOPTS    ?=
 SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = source
 BUILDDIR      = build
+AUTOSUMMARYDIR = source/api/_autosummary
 
 # Put it first so that "make" without argument is like "make help".
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-.PHONY: help Makefile
+clean:
+	@echo "Removing autosummary directory"
+	@rm -rf $(AUTOSUMMARYDIR)
+	@$(SPHINXBUILD) -M clean "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help clean Makefile
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).

docs/make.bat

@@ -9,8 +9,10 @@ if "%SPHINXBUILD%" == "" (
 )
 set SOURCEDIR=source
 set BUILDDIR=build
+set AUTOSUMMARYDIR=source\api\_autosummary
 
 if "%1" == "" goto help
+if "%1" == "clean" goto clean
 
 %SPHINXBUILD% >NUL 2>NUL
 if errorlevel 9009 (
@@ -30,6 +32,12 @@ goto end
 
 :help
 %SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:clean
+echo Removing autosummary directory
+rmdir /s/q %AUTOSUMMARYDIR%
+%SPHINXBUILD% -M clean %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 
 :end
 popd

docs/source/api/index.rst

@@ -4,7 +4,6 @@ API Reference
 
 .. autosummary::
    :toctree: _autosummary
-   :template: autosummary-module.rst
    :recursive:
 
    lyse

docs/source/conf.py

@@ -14,19 +14,15 @@
 import os
 from pathlib import Path
 from jinja2 import FileSystemLoader, Environment
-try:
-    import importlib.metadata as importlib_metadata
-except ImportError:
-    import importlib_metadata
-
+import importlib.metadata
 # -- Project information (unique to each project) -------------------------------------
 
 project = "lyse"
 copyright = "2024, labscript suite"
 author = "labscript suite contributors"
 
 # The full version, including alpha/beta/rc tags
-version = importlib_metadata.version('lyse')
+version = importlib.metadata.version('lyse')
 
 release = version
 
@@ -87,7 +83,10 @@
 exclude_patterns = []
 
 # The suffix(es) of source filenames.
-source_suffix = ['.rst', '.md']
+source_suffix = {
+    '.rst': 'restructuredtext',
+    '.md': 'markdown',
+}
 
 # The master toctree document.
 master_doc = 'index'
@@ -108,7 +107,7 @@
     'h5py': ('https://docs.h5py.org/en/stable/', None),
     'pydaqmx': ('https://pythonhosted.org/PyDAQmx/', None),
     'qt': (
-        '',
+        'https://riverbankcomputing.com/static/Docs/PyQt5/',
         'pyqt5-modified-objects.inv',
     )  # from https://github.com/MSLNZ/msl-qt/blob/master/docs/create_pyqt_objects.py
     # under MIT License

docs/source/index.rst

@@ -3,8 +3,8 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-lyse
-====
+lyse |version|
+==============
 
 **lyse** is a component of the labscript suite. It is a combination API and GUI interface that leverages the API to run user provided analysis scripts of experiment shots. This documentation provides a brief outline of the use of lyse.
 

pyproject.toml

@@ -55,9 +55,9 @@ Tracker = "https://github.com/labscript-suite/lyse/issues/"
 [project.optional-dependencies]
 docs = [
     "PyQt5",
-    "Sphinx==7.2.6",
-    "sphinx-rtd-theme==2.0.0",
-    "myst_parser==2.0.0",
+    "Sphinx==8.2.3",
+    "sphinx-rtd-theme==3.0.2",
+    "myst_parser==4.0.1",
 ]
 
 [project.scripts]

readthedocs.yaml

@@ -9,6 +9,13 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3.11"
+  jobs:
+    # ensure full git repo is pulled so setuptools_scm gets versions correctly on install
+    # https://docs.readthedocs.com/platform/stable/build-customization.html#unshallow-git-clone
+    post_checkout:
+      - git fetch --unshallow || true
+      - git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*' || true
+      - git fetch --all --tags || true
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx: