Skip to content

Commit 2bd788f

Browse files
authored
Merge pull request #26 from scipp/copier-update-2
update copier
2 parents d1cfaa6 + be0d937 commit 2bd788f

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: 8cfdb1b
2+
_commit: ee9a09a
33
_src_path: gh:scipp/copier_template
44
description: Reflectometry data reduction for the European Spallation Source
55
max_python: '3.12'

docs/conf.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
'nbsphinx',
3030
'myst_parser',
3131
]
32+
try:
33+
import sciline.sphinxext.domain_types # noqa: F401
34+
35+
extensions.append('sciline.sphinxext.domain_types')
36+
except ModuleNotFoundError:
37+
pass
3238

3339
myst_enable_extensions = [
3440
"amsmath",
@@ -54,6 +60,7 @@
5460
intersphinx_mapping = {
5561
'python': ('https://docs.python.org/3', None),
5662
'numpy': ('https://numpy.org/doc/stable/', None),
63+
'scipp': ('https://scipp.github.io/', None),
5764
}
5865

5966
# autodocs includes everything, even irrelevant API internals. autosummary
@@ -73,6 +80,16 @@
7380
typehints_defaults = 'comma'
7481
typehints_use_rtype = False
7582

83+
sciline_domain_types_prefix = 'essreflectometry'
84+
sciline_domain_types_aliases = {
85+
'scipp._scipp.core.DataArray': 'scipp.DataArray',
86+
'scipp._scipp.core.Dataset': 'scipp.Dataset',
87+
'scipp._scipp.core.DType': 'scipp.DType',
88+
'scipp._scipp.core.Unit': 'scipp.Unit',
89+
'scipp._scipp.core.Variable': 'scipp.Variable',
90+
'scipp.core.data_group.DataGroup': 'scipp.DataGroup',
91+
}
92+
7693
# Add any paths that contain templates here, relative to this directory.
7794
templates_path = ['_templates']
7895

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ minversion = "7.0"
5454
addopts = """
5555
--strict-config
5656
--strict-markers
57+
--import-mode=importlib
5758
-ra
5859
-v
5960
"""

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ commands = pytest
1515
[testenv:unpinned]
1616
description = Test with unpinned dependencies, as a user would install now.
1717
deps =
18+
-r requirements/basetest.txt
1819
essreflectometry
19-
pytest
2020
commands = pytest
2121

2222
[testenv:docs]

0 commit comments

Comments
 (0)