[MRG] Add a version.py => 2.0 alpha, add khmer@master to requirements…

….txt (#117) * add version info in sourmash_lib/version.py * update requirements * update to take version from a file * point khmer requirement at master.zip instead of git+https
sourmash-bio · Apr 10, 2017 · 9ab2433 · 9ab2433
1 parent 213e9cb
commit 9ab2433
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/requirements.txt b/requirements.txt
@@ -5,3 +5,5 @@ numpy
 matplotlib
 scipy
 Cython
+https://github.com/dib-lab/khmer/archive/master.zip
+
diff --git a/setup.py b/setup.py
@@ -4,7 +4,10 @@
 from setuptools import Extension
 import os
 
-VERSION="2.0-alpha"
+# retrieve VERSION from sourmash_lib/VERSION.
+thisdir = os.path.dirname(__file__)
+version_file = open(os.path.join(thisdir, 'sourmash_lib', 'VERSION'))
+VERSION = version_file.read().strip()
 
 EXTRA_COMPILE_ARGS = ['-std=c++11', '-pedantic']
 EXTRA_LINK_ARGS=[]

diff --git a/sourmash_lib/VERSION b/sourmash_lib/VERSION
@@ -0,0 +1 @@
+2.0.0a1
diff --git a/sourmash_lib/__init__.py b/sourmash_lib/__init__.py
@@ -6,6 +6,12 @@
 import re
 import math
 from ._minhash import (MinHash, get_minhash_default_seed, get_minhash_max_hash)
+import os
+
+# retrieve VERSION from sourmash_lib/VERSION.
+thisdir = os.path.dirname(__file__)
+version_file = open(os.path.join(thisdir, 'VERSION'))
+VERSION = version_file.read().strip()
 
 DEFAULT_SEED = get_minhash_default_seed()
 MAX_HASH = get_minhash_max_hash()