Skip to content

Commit 47172a6

Browse files
author
Release Manager
committed
sagemathgh-40904: Fix missing `conf.py` files during docbuilding <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes sagemath#12345". --> Fixes the issue mentioned in sagemath#39030 (comment): ``` [tutorial ] Configuration error! [tutorial ] Versions [tutorial ] ======== [tutorial ] * Platform: linux; (Linux-6.15.7-arch1-1-x86_64-with-glibc2.42) [tutorial ] * Python version: 3.13.7 (CPython) [tutorial ] * Sphinx version: 8.2.3 [tutorial ] * Docutils version: 0.21.2 [tutorial ] * Jinja2 version: 3.1.6 [tutorial ] * Pygments version: 2.19.2 [tutorial ] Last Messages [tutorial ] ============= [tutorial ] None. [tutorial ] Loaded Extensions [tutorial ] ================= [tutorial ] None. [tutorial ] Traceback [tutorial ] ========= [tutorial ] File "/usr/lib/python3.13/site- packages/sphinx/config.py", line 354, in read [tutorial ] raise ConfigError( [tutorial ] __("config directory doesn't contain a conf.py file (%s)") % confdir [tutorial ] ) [tutorial ] sphinx.errors.ConfigError: config directory doesn't contain a conf.py file (/build/sagemath-doc- git/src/build/src/doc/ru/tutorial) [tutorial ] The full traceback has been saved in: [tutorial ] /tmp/sphinx-err-6fr5ejwk.log [tutorial ] To report this error to the developers, please open an issue at <https://github.com/sphinx-doc/sphinx/issues/>. Thanks! [tutorial ] Please also report this if it was a user error, so that a better error message can be provided next time. ``` ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#40904 Reported by: Tobias Diez Reviewer(s):
2 parents f1d90d4 + d79c996 commit 47172a6

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

src/doc/meson.build

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@ if not sphinx_check.found()
1010
subdir_done()
1111
endif
1212

13-
# TODO: Migrate this completely to meson
14-
doc_bootstrap = custom_target(
15-
'bootstrap',
16-
output: ['autogen'],
17-
command: [files('bootstrap'), meson.current_build_dir()],
18-
env: {'SAGE_ROOT': root},
19-
)
2013
doc_src = []
2114
subdir('el')
2215
subdir('ca')
@@ -33,6 +26,17 @@ subdir('es')
3326
subdir('fr')
3427
subdir('ja')
3528

29+
# TODO: Migrate this completely to meson
30+
doc_bootstrap = custom_target(
31+
'bootstrap',
32+
output: ['autogen'],
33+
command: [files('bootstrap'), meson.current_build_dir()],
34+
env: {'SAGE_ROOT': root},
35+
# doc_src is not really a dependency of the bootstrap, but we want to make sure
36+
# that all the source files are present before running the actual doc build
37+
# so let's collect all source-related targets here.
38+
depends: doc_src,
39+
)
3640

3741
references = run_command(
3842
py,
@@ -79,7 +83,6 @@ foreach type : ['inventory', 'html', 'pdf']
7983
endif
8084
target = custom_target(
8185
'doc-' + type + '-reference-' + short_ref,
82-
#input: doc_src,
8386
output: [type + short_ref],
8487
command: [
8588
py,

0 commit comments

Comments
 (0)