Get version for sphinx from sshuttle.version

This commit is contained in:
Brian May 2017-07-09 09:03:35 +10:00
parent e76d1e14bd
commit c093b4bd96
2 changed files with 7 additions and 9 deletions

View File

@ -1,4 +1 @@
Changelog
---------
.. include:: ../CHANGES.rst .. include:: ../CHANGES.rst

View File

@ -13,9 +13,10 @@
# All configuration values have a default; values that are commented out # All configuration values have a default; values that are commented out
# serve to show the default. # serve to show the default.
# import sys import sys
# import os import os
from setuptools_scm import get_version sys.path.insert(0, os.path.abspath('..'))
import sshuttle.version # NOQA
# If extensions (or modules to document with autodoc) are in another directory, # If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the # add these directories to sys.path here. If the directory is relative to the
@ -54,10 +55,10 @@ copyright = '2016, Brian May'
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
# built documents. # built documents.
# #
# The short X.Y version.
version = get_version(root="..")
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = version release = sshuttle.version.version
# The short X.Y version.
version = '.'.join(release.split('.')[:2])
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.