From cd0130abfd8931bc6b7eadb45c799bdd7aa082bb Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 10 Nov 2019 21:48:28 +0100 Subject: [PATCH] Try to debug the autodoxy pb on framagit builders - increase sphinx verbosity on gitlab - build pages asap (not after regular builds) - simplify the imports that are not found (top of file, not within a function) --- .gitlab-ci.yml | 18 +++++++++--------- docs/source/_ext/autodoxy/__init__.py | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a27f3c2e4..edb2cb061f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,18 +1,18 @@ image: simgrid/build-deps -stages: - - build - - test +#stages: +# - build +# - test pages: - stage: test +# stage: test script: - cmake -Denable_model-checking=OFF -Denable_documentation=ON -Denable_compile_optimizations=OFF -Denable_smpi=OFF -Dpython=ON . - make -j4 - pip3 install --requirement docs/requirements.txt - cd docs - - LC_ALL=C.UTF-8 ./Build.sh - - mv build/html ../public || (cat /tmp/sphinx-err-* ; false) + - LC_ALL=C.UTF-8 SPHINXOPTS=-vvv ./Build.sh || (cat /tmp/sphinx-err-* ; false) + - mv build/html ../public # - The CSS contains a reference to a font or something, not something we gonna fix on our side # - The javasphinx output does not exist in the git, so the "edit on FramaGit" link is broken. # I'd like to report this as a bug, but javasphinx seems abandonned upstream. @@ -27,7 +27,7 @@ pages: - master ctest: - stage: build +# stage: build except: - stable script: @@ -36,7 +36,7 @@ ctest: pip: image: debian:testing - stage: build +# stage: build except: - stable script: @@ -45,7 +45,7 @@ pip: - cd dist && tar xfz simgrid*.tar.gz && cd simgrid-*/ && python3 setup.py build release: - stage: build +# stage: build only: - stable script: diff --git a/docs/source/_ext/autodoxy/__init__.py b/docs/source/_ext/autodoxy/__init__.py index 29b12f9321..c113b0296a 100644 --- a/docs/source/_ext/autodoxy/__init__.py +++ b/docs/source/_ext/autodoxy/__init__.py @@ -2,6 +2,10 @@ import os.path from lxml import etree as ET from sphinx.errors import ExtensionError +import sphinx.ext.autosummary +from autodoxy import DoxygenClassDocumenter, DoxygenMethodDocumenter, DoxygenTypeDocumenter +from autodoxy.autosummary import DoxygenAutosummary, DoxygenAutoEnum +from autodoxy.autosummary.generate import process_generate_options def set_doxygen_xml(app): """Load all doxygen XML files from the app config variable @@ -34,10 +38,6 @@ def get_doxygen_root(): return setup.DOXYGEN_ROOT def setup(app): - import sphinx.ext.autosummary - from autodoxy import DoxygenClassDocumenter, DoxygenMethodDocumenter, DoxygenTypeDocumenter - from autodoxy.autosummary import DoxygenAutosummary, DoxygenAutoEnum - from autodoxy.autosummary.generate import process_generate_options app.connect("builder-inited", set_doxygen_xml) app.connect("builder-inited", process_generate_options) -- 2.20.1