Simplify the get_version method

Use post segment instead of dev for non-dev tags.
Default to 'deluge-' and '.dev0' to simplify getting version.
Refactor to use subprocess.check_output
Use deluge.common.get_version as fallback in docs conf.

1 files changed, 2 insertions, 6 deletions

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 313c35289..44b0f3f5d 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -14,7 +14,6 @@ import os
 import sys
 from datetime import date
 
-import pkg_resources
 from recommonmark.states import DummyStateMachine
 from recommonmark.transform import AutoStructify
 from six.moves import builtins
@@ -34,7 +33,7 @@ sys.path.append(
 try:
     from version import get_version
 except ImportError:
-    get_version = None
+    from deluge.common import get_version
 
 
 # General configuration
@@ -71,10 +70,7 @@ current_year = date.today().year
 copyright = '2008-%s, Deluge Team' % current_year  # noqa: A001
 
 # The full version, including alpha/beta/rc tags.
-if get_version:
-    release = get_version(prefix='deluge-', suffix='.dev0')
-else:
-    release = pkg_resources.get_distribution('Deluge').version
+release = get_version()
 # The short X.Y version.
 version = '.'.join(release.split('.', 2)[:2])