Browse Source

Replace default outputdir format

Jan Holthuis 5 years ago
parent
commit
8f992a3761
2 changed files with 5 additions and 1 deletions
  1. 4 0
      sphinx_multiversion/main.py
  2. 1 1
      sphinx_multiversion/sphinx.py

+ 4 - 0
sphinx_multiversion/main.py

@@ -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(

+ 1 - 1
sphinx_multiversion/sphinx.py

@@ -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',