Skip to content

Commit 1de6263

Browse files
committed
Update sphinx pins and refresh build
1 parent c66c8df commit 1de6263

File tree

6 files changed

+34
-13
lines changed

6 files changed

+34
-13
lines changed

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/conf.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
import os
1515
from pathlib import Path
1616
from jinja2 import FileSystemLoader, Environment
17-
try:
18-
import importlib.metadata as importlib_metadata
19-
except ImportError:
20-
import importlib_metadata
17+
import importlib.metadata
2118

2219
# -- Project information (unique to each project) -------------------------------------
2320

@@ -26,7 +23,7 @@
2623
author = "labscript suite contributors"
2724

2825
# The full version, including alpha/beta/rc tags
29-
version = importlib_metadata.version('runmanager')
26+
version = importlib.metadata.version('runmanager')
3027

3128
release = version
3229

@@ -117,7 +114,10 @@ def set_process_name(self,*args,**kwargs):
117114
exclude_patterns = []
118115

119116
# The suffix(es) of source filenames.
120-
source_suffix = ['.rst', '.md']
117+
source_suffix = {
118+
'.rst': 'restructuredtext',
119+
'.md': 'markdown',
120+
}
121121

122122
# The master toctree document.
123123
master_doc = 'index'
@@ -138,7 +138,7 @@ def set_process_name(self,*args,**kwargs):
138138
'h5py': ('https://docs.h5py.org/en/stable/', None),
139139
'pydaqmx': ('https://pythonhosted.org/PyDAQmx/', None),
140140
'qt': (
141-
'',
141+
'https://riverbankcomputing.com/static/Docs/PyQt5/',
142142
'pyqt5-modified-objects.inv',
143143
) # from https://github.com/MSLNZ/msl-qt/blob/master/docs/create_pyqt_objects.py
144144
# 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-
runmanager
7-
==========
6+
runmanager |version|
7+
====================
88

99
A graphical and remote interface to parameterized experiments.
1010

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ Tracker = "https://github.com/labscript-suite/runmanager/issues/"
5858
[project.optional-dependencies]
5959
docs = [
6060
"PyQt5",
61-
"Sphinx==7.2.6",
62-
"sphinx-rtd-theme==2.0.0",
63-
"myst_parser==2.0.0",
61+
"Sphinx==8.2.3",
62+
"sphinx-rtd-theme==3.0.2",
63+
"myst_parser==4.0.1",
6464
]
6565

6666
[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)