hiro/sphinx-multiversion
1
0
Fork 0
mirror of https://github.com/vale981/sphinx-multiversion synced 2025-03-04 17:11:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace default outputdir format

Browse source
This commit is contained in:
Jan Holthuis 2020-02-23 17:11:00 +01:00
parent 88171df2dd
commit 8f992a3761
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sphinx_multiversion/main.py
View file

@ -49,6 +49,8 @@ def main(argv=None):
config.add("smv_remote_whitelist", sphinx.DEFAULT_REMOTE_WHITELIST, "html", str)
config.add("smv_released_pattern", sphinx.DEFAULT_RELEASED_PATTERN, "html", str)
config.add("smv_outputdir_format", sphinx.DEFAULT_OUTPUTDIR_FORMAT, "html", str)
config.pre_init_values()
config.init_values()
# Get git references
gitroot = pathlib.Path('.').resolve()
@ -95,6 +97,8 @@ def main(argv=None):
"Failed load config for %s from %s",
gitref.refname, confpath)
continue
current_config.pre_init_values()
current_config.init_values()
# Ensure that there are not duplicate output dirs
outputdir = config.smv_outputdir_format.format(

2
sphinx_multiversion/sphinx.py
View file

@ -13,7 +13,7 @@ DEFAULT_TAG_WHITELIST = r'^.*$'
DEFAULT_BRANCH_WHITELIST = r'^.*$'
DEFAULT_REMOTE_WHITELIST = None
DEFAULT_RELEASED_PATTERN = r'^tags/.*$'
DEFAULT_OUTPUTDIR_FORMAT = r'{config.version}/{config.language}'
DEFAULT_OUTPUTDIR_FORMAT = r'{ref.name}'
Version = collections.namedtuple('Version', [
'name',