Skip to content

Commit e15ef6e

Browse files
committed
Squashed commit of the following:
commit 001dcde0805f8c718be767d9421975a9ee2a37df Author: David Meyer <dihm@users.noreply.github.com> Date: Sun Aug 3 00:11:07 2025 -0400 Merge pull request #110 from dihm/sphinx_update Update sphinx and fix RTD-stable versioning commit dc835e621506a7f6cebcd542a4206eef92c19174 Author: David Meyer <dihm.meyer@gmail.com> Date: Tue Apr 29 14:15:31 2025 -0400 Fix README shield link target
1 parent 1eab0a4 commit e15ef6e

8 files changed

Lines changed: 35 additions & 11 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[![License](https://img.shields.io/pypi/l/blacs.svg)](https://github.com/labscript-suite/blacs/raw/master/LICENSE.txt)
99
[![Python Version](https://img.shields.io/pypi/pyversions/blacs.svg)](https://python.org)
1010
[![PyPI](https://img.shields.io/pypi/v/blacs.svg)](https://pypi.org/project/blacs)
11-
[![Conda Version](https://img.shields.io/conda/v/labscript-suite/lyse)](https://anaconda.org/labscript-suite/blacs)
11+
[![Conda Version](https://img.shields.io/conda/v/labscript-suite/blacs)](https://anaconda.org/labscript-suite/blacs)
1212
[![Google Group](https://img.shields.io/badge/Google%20Group-labscriptsuite-blue.svg)](https://groups.google.com/forum/#!forum/labscriptsuite)
1313
<!--[![DOI](http://img.shields.io/badge/DOI-10.1063%2F1.4817213-0F79D0.svg)](https://doi.org/10.1063/1.4817213)-->
1414

docs/Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,18 @@ SPHINXOPTS ?=
77
SPHINXBUILD ?= sphinx-build
88
SOURCEDIR = source
99
BUILDDIR = build
10+
AUTOSUMMARYDIR = source/api/_autosummary
1011

1112
# Put it first so that "make" without argument is like "make help".
1213
help:
1314
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
1415

15-
.PHONY: help Makefile
16+
clean:
17+
@echo "Removing autosummary directory"
18+
@rm -rf $(AUTOSUMMARYDIR)
19+
@$(SPHINXBUILD) -M clean "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
20+
21+
.PHONY: help clean Makefile
1622

1723
# Catch-all target: route all unknown targets to Sphinx using the new
1824
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).

docs/make.bat

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ if "%SPHINXBUILD%" == "" (
99
)
1010
set SOURCEDIR=source
1111
set BUILDDIR=build
12+
set AUTOSUMMARYDIR=source\api\_autosummary
1213

1314
if "%1" == "" goto help
15+
if "%1" == "clean" goto clean
1416

1517
%SPHINXBUILD% >NUL 2>NUL
1618
if errorlevel 9009 (
@@ -30,6 +32,12 @@ goto end
3032

3133
:help
3234
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
35+
goto end
36+
37+
:clean
38+
echo Removing autosummary directory
39+
rmdir /s/q %AUTOSUMMARYDIR%
40+
%SPHINXBUILD% -M clean %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
3341

3442
:end
3543
popd

docs/source/api/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ API Reference
33

44
.. autosummary::
55
:toctree: _autosummary
6-
:template: autosummary-module.rst
76
:recursive:
87

98
blacs.analysis_submission

docs/source/conf.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import os
1515
from pathlib import Path
1616
from jinja2 import FileSystemLoader, Environment
17+
import importlib.metadata
1718

1819
# -- Project information (unique to each project) -------------------------------------
1920

@@ -22,7 +23,7 @@
2223
author = "labscript suite contributors"
2324

2425
# The full version, including alpha/beta/rc tags
25-
from blacs import __version__ as version # noqa: E402
26+
version = importlib.metadata.version('blacs')
2627

2728
release = version
2829

@@ -83,7 +84,10 @@
8384
exclude_patterns = []
8485

8586
# The suffix(es) of source filenames.
86-
source_suffix = ['.rst', '.md']
87+
source_suffix = {
88+
'.rst': 'restructuredtext',
89+
'.md': 'markdown',
90+
}
8791

8892
# The master toctree document.
8993
master_doc = 'index'
@@ -104,7 +108,7 @@
104108
'h5py': ('https://docs.h5py.org/en/stable/', None),
105109
'pydaqmx': ('https://pythonhosted.org/PyDAQmx/', None),
106110
'qt': (
107-
'',
111+
'https://riverbankcomputing.com/static/Docs/PyQt5/',
108112
'pyqt5-modified-objects.inv',
109113
) # from https://github.com/MSLNZ/msl-qt/blob/master/docs/create_pyqt_objects.py
110114
# under MIT License

docs/source/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
You can adapt this file completely to your liking, but it should at least
44
contain the root `toctree` directive.
55
6-
blacs
7-
=====
6+
blacs |version|
7+
===============
88

99
A graphical interface to scientific instruments and experiment supervision.
1010

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ Tracker = "https://github.com/labscript-suite/blacs/issues/"
5050
[project.optional-dependencies]
5151
docs = [
5252
"PyQt5",
53-
"Sphinx==7.2.6",
54-
"sphinx-rtd-theme==2.0.0",
55-
"myst_parser==2.0.0",
53+
"Sphinx==8.2.3",
54+
"sphinx-rtd-theme==3.0.2",
55+
"myst_parser==4.0.1",
5656
]
5757

5858
[project.scripts]

readthedocs.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ build:
99
os: ubuntu-22.04
1010
tools:
1111
python: "3.11"
12+
jobs:
13+
# ensure full git repo is pulled so setuptools_scm gets versions correctly on install
14+
# https://docs.readthedocs.com/platform/stable/build-customization.html#unshallow-git-clone
15+
post_checkout:
16+
- git fetch --unshallow || true
17+
- git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*' || true
18+
- git fetch --all --tags || true
1219

1320
# Build documentation in the docs/ directory with Sphinx
1421
sphinx:

0 commit comments

Comments
 (0)