Skip to content

Commit c228da6

Browse files
authored
Merge pull request #187 from scipp/docs-fixes
Fix warnings and other issues in docs
2 parents 9cbe154 + ff6592e commit c228da6

File tree

17 files changed

+217
-155
lines changed

17 files changed

+217
-155
lines changed

docs/api-reference/index.md

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@
1010
:toctree: ../generated/attributes
1111
1212
providers
13+
14+
.. autosummary::
15+
:toctree: ../generated/classes
16+
17+
RunNormalization
18+
19+
.. autosummary::
20+
:toctree: ../generated/functions
21+
1322
with_pixel_mask_filenames
1423
```
1524

@@ -21,17 +30,37 @@
2130
:template: module-template.rst
2231
:recursive:
2332
33+
calibration
2434
conversion
2535
correction
2636
filtering
2737
grouping
38+
logging
39+
masking
2840
smoothing
2941
transform
3042
types
3143
```
3244

3345
## ESSdream
3446

47+
### Workflows
48+
49+
50+
```{eval-rst}
51+
.. currentmodule:: ess.dream
52+
53+
.. autosummary::
54+
:toctree: ../generated/functions
55+
56+
DreamGeant4MonitorHistogramWorkflow
57+
DreamGeant4MonitorIntegratedWorkflow
58+
DreamGeant4ProtonChargeWorkflow
59+
DreamGeant4Workflow
60+
DreamPowderWorkflow
61+
DreamWorkflow
62+
```
63+
3564
### Top-level functions
3665

3766
```{eval-rst}
@@ -41,7 +70,18 @@
4170
:toctree: ../generated/functions
4271
4372
instrument_view
44-
DreamGeant4Workflow
73+
load_geant4_csv
74+
```
75+
76+
### Top-level classes
77+
78+
```{eval-rst}
79+
.. currentmodule:: ess.dream
80+
81+
.. autosummary::
82+
:toctree: ../generated/classes
83+
84+
InstrumentConfiguration
4585
```
4686

4787
### Submodules
@@ -52,6 +92,7 @@
5292
:template: module-template.rst
5393
:recursive:
5494
95+
beamline
5596
data
5697
diagnostics
5798
io

docs/conf.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"sphinx_autodoc_typehints",
3333
"sphinx_copybutton",
3434
"sphinx_design",
35+
"sphinxcontrib.autodoc_pydantic",
3536
"sphinxcontrib.bibtex",
3637
"nbsphinx",
3738
"myst_parser",
@@ -69,9 +70,17 @@
6970
}
7071

7172
intersphinx_mapping = {
72-
"python": ("https://docs.python.org/3", None),
7373
"numpy": ("https://numpy.org/doc/stable/", None),
74+
"pydantic": ("https://docs.pydantic.dev/latest", None),
75+
"python": ("https://docs.python.org/3", None),
76+
# Scipp:
77+
"essreduce": ("https://scipp.github.io/essreduce", None),
78+
"plopp": ("https://scipp.github.io/plopp", None),
79+
"sciline": ("https://scipp.github.io/sciline", None),
7480
"scipp": ("https://scipp.github.io/", None),
81+
"scippneutron": ("https://scipp.github.io/scippneutron", None),
82+
"scippnexus": ("https://scipp.github.io/scippnexus", None),
83+
"tof": ("https://scipp.github.io/tof", None),
7584
}
7685

7786
# autodocs includes everything, even irrelevant API internals. autosummary

docs/user-guide/dream/dream-advanced-powder-reduction.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"The basic notebook sums over all detector voxels and produces a 1D curve.\n",
4343
"Here, we instead bin by scattering angle $2\\theta$.\n",
4444
"\n",
45-
"First, define the same workflow as in the [basic example](./dream-powder-reduction.rst#create_and_configure_the_workfow):"
45+
"First, define the same workflow as in the [basic example](./dream-powder-reduction.rst):"
4646
]
4747
},
4848
{

requirements/base.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SHA1:81114073dd5e4b765405b54b3976f92d6a96439b
22
#
3-
# This file is autogenerated by pip-compile-multi
3+
# This file was generated by pip-compile-multi.
44
# To update, run:
55
#
6-
# pip-compile-multi
6+
# requirements upgrade
77
#
88
annotated-types==0.7.0
99
# via pydantic
@@ -35,13 +35,13 @@ exceptiongroup==1.3.0
3535
# via ipython
3636
executing==2.2.0
3737
# via stack-data
38-
fonttools==4.58.1
38+
fonttools==4.58.4
3939
# via matplotlib
4040
fsspec==2025.5.1
4141
# via dask
42-
graphviz==0.20.3
42+
graphviz==0.21
4343
# via -r base.in
44-
h5py==3.13.0
44+
h5py==3.14.0
4545
# via
4646
# scippneutron
4747
# scippnexus
@@ -102,9 +102,9 @@ partd==1.4.2
102102
# via dask
103103
pexpect==4.9.0
104104
# via ipython
105-
pillow==11.2.1
105+
pillow==11.3.0
106106
# via matplotlib
107-
plopp==25.5.0
107+
plopp==25.6.1
108108
# via
109109
# -r base.in
110110
# scippneutron
@@ -115,11 +115,11 @@ ptyprocess==0.7.0
115115
# via pexpect
116116
pure-eval==0.2.3
117117
# via stack-data
118-
pydantic==2.11.5
118+
pydantic==2.11.7
119119
# via scippneutron
120120
pydantic-core==2.33.2
121121
# via pydantic
122-
pygments==2.19.1
122+
pygments==2.19.2
123123
# via ipython
124124
pyparsing==3.2.3
125125
# via matplotlib
@@ -143,11 +143,11 @@ scipp==25.5.1
143143
# scippneutron
144144
# scippnexus
145145
# tof
146-
scippneutron==25.5.0
146+
scippneutron==25.6.0
147147
# via
148148
# -r base.in
149149
# essreduce
150-
scippnexus==25.4.0
150+
scippnexus==25.6.0
151151
# via
152152
# -r base.in
153153
# essreduce
@@ -177,7 +177,7 @@ traitlets==5.14.3
177177
# traittypes
178178
traittypes==0.2.1
179179
# via ipydatawidgets
180-
typing-extensions==4.13.2
180+
typing-extensions==4.14.0
181181
# via
182182
# exceptiongroup
183183
# ipython
@@ -191,5 +191,5 @@ wcwidth==0.2.13
191191
# via prompt-toolkit
192192
widgetsnbextension==4.0.14
193193
# via ipywidgets
194-
zipp==3.22.0
194+
zipp==3.23.0
195195
# via importlib-metadata

requirements/basetest.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# SHA1:c4f3e9aaa3abd10fcdf497bea14415857f62cc89
22
#
3-
# This file is autogenerated by pip-compile-multi
3+
# This file was generated by pip-compile-multi.
44
# To update, run:
55
#
6-
# pip-compile-multi
6+
# requirements upgrade
77
#
8-
certifi==2025.4.26
8+
certifi==2025.6.15
99
# via requests
1010
charset-normalizer==3.4.2
1111
# via requests
@@ -21,29 +21,31 @@ packaging==25.0
2121
# via
2222
# pooch
2323
# pytest
24-
pandas==2.2.3
24+
pandas==2.3.0
2525
# via -r basetest.in
2626
platformdirs==4.3.8
2727
# via pooch
2828
pluggy==1.6.0
2929
# via pytest
3030
pooch==1.8.2
3131
# via -r basetest.in
32-
pytest==8.3.5
32+
pygments==2.19.2
33+
# via pytest
34+
pytest==8.4.1
3335
# via -r basetest.in
3436
python-dateutil==2.9.0.post0
3537
# via pandas
3638
pytz==2025.2
3739
# via pandas
38-
requests==2.32.3
40+
requests==2.32.4
3941
# via pooch
4042
six==1.17.0
4143
# via python-dateutil
4244
tomli==2.2.1
4345
# via pytest
44-
typing-extensions==4.13.2
46+
typing-extensions==4.14.0
4547
# via exceptiongroup
4648
tzdata==2025.2
4749
# via pandas
48-
urllib3==2.4.0
50+
urllib3==2.5.0
4951
# via requests

requirements/ci.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# SHA1:6344d52635ea11dca331a3bc6eb1833c4c64d585
22
#
3-
# This file is autogenerated by pip-compile-multi
3+
# This file was generated by pip-compile-multi.
44
# To update, run:
55
#
6-
# pip-compile-multi
6+
# requirements upgrade
77
#
8-
cachetools==6.0.0
8+
cachetools==6.1.0
99
# via tox
10-
certifi==2025.4.26
10+
certifi==2025.6.15
1111
# via requests
1212
chardet==5.2.0
1313
# via tox
@@ -40,19 +40,19 @@ pluggy==1.6.0
4040
# via tox
4141
pyproject-api==1.9.1
4242
# via tox
43-
requests==2.32.3
43+
requests==2.32.4
4444
# via -r ci.in
4545
smmap==5.0.2
4646
# via gitdb
4747
tomli==2.2.1
4848
# via
4949
# pyproject-api
5050
# tox
51-
tox==4.26.0
51+
tox==4.27.0
5252
# via -r ci.in
53-
typing-extensions==4.13.2
53+
typing-extensions==4.14.0
5454
# via tox
55-
urllib3==2.4.0
55+
urllib3==2.5.0
5656
# via requests
5757
virtualenv==20.31.2
5858
# via tox

requirements/dev.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SHA1:efd19a3a98c69fc3d6d6233ed855de7e4a208f74
22
#
3-
# This file is autogenerated by pip-compile-multi
3+
# This file was generated by pip-compile-multi.
44
# To update, run:
55
#
6-
# pip-compile-multi
6+
# requirements upgrade
77
#
88
-r base.txt
99
-r ci.txt
@@ -16,7 +16,7 @@ anyio==4.9.0
1616
# via
1717
# httpx
1818
# jupyter-server
19-
argon2-cffi==23.1.0
19+
argon2-cffi==25.1.0
2020
# via jupyter-server
2121
argon2-cffi-bindings==21.2.0
2222
# via argon2-cffi
@@ -65,21 +65,21 @@ jupyter-server==2.16.0
6565
# notebook-shim
6666
jupyter-server-terminals==0.5.3
6767
# via jupyter-server
68-
jupyterlab==4.4.3
68+
jupyterlab==4.4.4
6969
# via -r dev.in
7070
jupyterlab-server==2.27.3
7171
# via jupyterlab
7272
notebook-shim==0.2.4
7373
# via jupyterlab
7474
overrides==7.7.0
7575
# via jupyter-server
76-
pip-compile-multi==3.1.0
76+
pip-compile-multi==3.2.1
7777
# via -r dev.in
7878
pip-tools==7.4.1
7979
# via pip-compile-multi
8080
plumbum==1.9.0
8181
# via copier
82-
prometheus-client==0.22.0
82+
prometheus-client==0.22.1
8383
# via jupyter-server
8484
pycparser==2.22
8585
# via cffi

requirements/docs.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
-r base.in
2+
autodoc-pydantic
23
ipykernel
34
ipympl
45
ipython!=8.7.0 # Breaks syntax highlighting in Jupyter code cells.

0 commit comments

Comments
 (0)