Skip to content

Commit 6a4915e

Browse files
authored
Remove multiversion support due to deprecation/incompatibility of extensions that support this capability (omec-project#91)
Signed-off-by: Arrobo, Gabriel <gabriel.arrobo@intel.com>
1 parent 420083d commit 6a4915e

File tree

5 files changed

+3
-54
lines changed

5 files changed

+3
-54
lines changed

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,10 @@ clean:
5858
clean-all: clean
5959
rm -rf $(VENV_NAME)
6060

61-
# build multiple versions
61+
# build docs (compatibility target for CI workflow)
6262
multiversion: $(VENV_NAME) Makefile
6363
source $</bin/activate ; set -u ;\
64-
sphinx-multiversion "$(SOURCEDIR)" "$(BUILDDIR)/multiversion" $(SPHINXOPTS)
65-
cp "$(SOURCEDIR)/_templates/meta_refresh.html" "$(BUILDDIR)/multiversion/index.html"
64+
$(SPHINXBUILD) -b html "$(SOURCEDIR)" "$(BUILDDIR)/multiversion" $(SPHINXOPTS)
6665

6766
# Catch-all target: route all unknown targets to Sphinx using the new
6867
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).

_templates/meta_refresh.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
-->
55
<html><head>
66
<meta charset="UTF-8">
7-
<meta http-equiv="refresh" content="0;url=main/index.html" />
7+
<meta http-equiv="refresh" content="0;url=index.html" />
88
</head></html>

_templates/versions.html

Lines changed: 0 additions & 31 deletions
This file was deleted.

conf.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ def get_version():
5858
'sphinx.ext.mathjax',
5959
'sphinx.ext.todo',
6060
'sphinxcontrib.spelling',
61-
"sphinx_multiversion",
6261
]
6362

6463
# require document prefix on section labels
@@ -67,23 +66,6 @@ def get_version():
6766
# Text files with lists of words that shouldn't fail the spellchecker:
6867
spelling_word_list_filename=['dict.txt', ]
6968

70-
# sphinx-multiversion prep, run in each versioned source directory
71-
prep_commands = [
72-
]
73-
74-
# include only the branches matching main and sdcore-*
75-
# Note, we changed 'master' to 'main', so 'master' may show up repeatedly in
76-
# documentation. Simply use 'main' where you expect to see 'master' branch
77-
# items.
78-
smv_branch_whitelist = r'^(main|sdcore-.*)$'
79-
80-
# Don't include any tags - smv docs say you can put None here, but that is broken
81-
# https://github.com/Holzhaus/sphinx-multiversion/issues/47
82-
smv_tag_whitelist = r'notags'
83-
84-
# include all remote branches
85-
smv_remote_whitelist = r'^.*$'
86-
8769
# Add any paths that contain templates here, relative to this directory.
8870
templates_path = ['_templates']
8971

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ doc8~=2.0.0
66
reuse~=6.2.0
77
sphinx-rtd-theme~=3.1.0
88
sphinxcontrib-spelling~=8.0.2
9-
sphinx-multiversion~=0.2.4

0 commit comments

Comments
 (0)