Revert version number in sphinx to use setuptools_scm.

tskit-dev · Feb 2, 2018 · caf3835 · caf3835
1 parent 6058a6d
commit caf3835
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -138,11 +138,10 @@ def handle_item(fieldarg, content):
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-# Following advice from setuptools_scm at
-# https://github.com/pypa/setuptools_scm
 try:
-    release = pkg_resources.get_distribution('msprime').version
-    version = '.'.join(release.split('.')[:2])
+    from setuptools_scm import get_version
+    release = get_version(root='..', relative_to=__file__)
+    version = release[:3]
 except pkg_resources.DistributionNotFound:
     release = "0.0.0"
     version = "0.0.0"

diff --git a/setup.py b/setup.py
@@ -45,7 +45,6 @@
     warn("numpy not available. Some features will not work.")
 
 
-
 class PathConfigurator(object):
     """
     A class to attempt configuration of the compile search paths
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,6 @@ @@
         warn("numpy not available. Some features will not work.")
     class PathConfigurator(object):
         """
         A class to attempt configuration of the compile search paths
@@ Expand Down @@