diff --git a/sphinx_multiversion/main.py b/sphinx_multiversion/main.py index bfb5b68..67470fc 100644 --- a/sphinx_multiversion/main.py +++ b/sphinx_multiversion/main.py @@ -91,6 +91,7 @@ def main(argv=None): project = sphinx_project.Project(srcdir, source_suffixes) metadata[versionref.name] = { "name": versionref.name, + "version": versionref.version, "source": versionref.source, "sourcedir": srcdir, "outputdir": outputdir, diff --git a/sphinx_multiversion/sphinx.py b/sphinx_multiversion/sphinx.py index 88a8291..d79bb3a 100644 --- a/sphinx_multiversion/sphinx.py +++ b/sphinx_multiversion/sphinx.py @@ -14,7 +14,7 @@ DEFAULT_BRANCH_WHITELIST = r'^.*$' DEFAULT_REMOTE_WHITELIST = None DEFAULT_OUTPUTDIR_FORMAT = r'{version.version}/{language}' -Version = collections.namedtuple('Version', ['version', 'url']) +Version = collections.namedtuple('Version', ['name', 'url', 'version']) class VersionInfo: @@ -26,14 +26,14 @@ class VersionInfo: @property def tags(self): return [ - Version(v["name"], self.vpathto(v["name"])) + Version(v["name"], self.vpathto(v["name"]), v["version"]) for v in self.metadata.values() if v["source"] == "tags" ] @property def branches(self): return [ - Version(v["name"], self.vpathto(v["name"])) + Version(v["name"], self.vpathto(v["name"]), v["version"]) for v in self.metadata.values() if v["source"] != "tags" ]