Skip to content

Commit 70cf869

Browse files
committed
Remove reference to deprecated packages
1 parent 9565177 commit 70cf869

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

doc/cmake.py

-20
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,6 @@
2121
CMakeLexer.tokens["args"].append(('(\\$<)(.+?)(>)',
2222
bygroups(Operator, Name.Variable, Operator)))
2323

24-
# Monkey patch for sphinx generating invalid content for qcollectiongenerator
25-
# https://bitbucket.org/birkenfeld/sphinx/issue/1435/qthelp-builder-should-htmlescape-keywords
26-
from sphinx.util.pycompat import htmlescape
27-
from sphinx.builders.qthelp import QtHelpBuilder
28-
old_build_keywords = QtHelpBuilder.build_keywords
29-
30-
31-
def new_build_keywords(self, title, refs, subitems):
32-
old_items = old_build_keywords(self, title, refs, subitems)
33-
new_items = []
34-
for item in old_items:
35-
before, rest = item.split("ref=\"", 1)
36-
ref, after = rest.split("\"")
37-
if ("<" in ref and ">" in ref):
38-
new_items.append(before + 'ref="' + htmlescape(ref) + '"' + after)
39-
else:
40-
new_items.append(item)
41-
return new_items
42-
QtHelpBuilder.build_keywords = new_build_keywords
43-
4424

4525
from docutils.parsers.rst import Directive, directives
4626
from docutils.transforms import Transform

doc/conf.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,11 @@ def parse_version(ver_str):
4242

4343
html_show_sourcelink = True
4444
html_static_path = [os.path.join(here, 'static')]
45-
html_theme = 'default'
45+
html_theme = 'sphinx_rtd_theme'
4646
html_title = 'ecBuild %s Documentation' % release
4747
html_short_title = '%s Documentation' % release
4848
html_favicon = os.path.join(here, 'static', 'ecbuild.ico')
49-
# Not supported yet by sphinx:
50-
# https://bitbucket.org/birkenfeld/sphinx/issue/1448/make-qthelp-more-configurable
51-
# qthelp_namespace = "org.cmake"
52-
# qthelp_qch_name = "CMake-300.qch"
49+
5350

5451
# Extract the docs from the .cmake files
5552
from generate import generate

0 commit comments

Comments
 (0)