diff options
| author | Brian May <brian@linuxpenguins.xyz> | 2017-07-09 09:03:35 +1000 |
|---|---|---|
| committer | Brian May <brian@linuxpenguins.xyz> | 2017-07-09 09:08:48 +1000 |
| commit | c093b4bd96d27e74eff6b66043b72f32589cb897 (patch) | |
| tree | 0b29b160015ef431fd6bff89eaeafc7e24d47eb1 | |
| parent | e76d1e14bd680882b8b3eb39116dd2d8b08185f4 (diff) | |
Get version for sphinx from sshuttle.version
| -rw-r--r-- | docs/changes.rst | 3 | ||||
| -rw-r--r-- | docs/conf.py | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/docs/changes.rst b/docs/changes.rst index a07471b..d9e113e 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -1,4 +1 @@ -Changelog ---------- - .. include:: ../CHANGES.rst diff --git a/docs/conf.py b/docs/conf.py index 5115570..6b15f80 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -13,9 +13,10 @@ # All configuration values have a default; values that are commented out # serve to show the default. -# import sys -# import os -from setuptools_scm import get_version +import sys +import os +sys.path.insert(0, os.path.abspath('..')) +import sshuttle.version # NOQA # 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 @@ -54,10 +55,10 @@ copyright = '2016, Brian May' # |version| and |release|, also used in various other places throughout the # built documents. # -# The short X.Y version. -version = get_version(root="..") # 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 # for a list of supported languages. |