From 9ab243354e6f51b11d3fed89d3c07aa7b56cfcec Mon Sep 17 00:00:00 2001 From: "C. Titus Brown" Date: Mon, 10 Apr 2017 13:01:44 -0700 Subject: [PATCH] [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 --- requirements.txt | 2 ++ setup.py | 5 ++++- sourmash_lib/VERSION | 1 + sourmash_lib/__init__.py | 6 ++++++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 sourmash_lib/VERSION diff --git a/requirements.txt b/requirements.txt index eb92ecae95..ea91a5fe4b 100644 --- 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 index 1883f0976e..6ccfce8821 100644 --- 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 new file mode 100644 index 0000000000..009ff11052 --- /dev/null +++ b/sourmash_lib/VERSION @@ -0,0 +1 @@ +2.0.0a1 diff --git a/sourmash_lib/__init__.py b/sourmash_lib/__init__.py index 2be1f92719..9feb8cac9c 100644 --- 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()