Merge branch 'master' into rfact/extract-part

ChangeLog

@@ -209,6 +209,13 @@
    * scripts/normalize-by-median.py,tests/test_normalize_by_median.py: test
    and fix for close of --output file after first input file.
 
+2015-10-19  Michael R. Crusoe  <crusoe@ucdavis.edu>
+
+   * versioneer.py,khmer/_version.py,setup.py,setup.cfg: upgrade Versioneer to
+   version 0.15+dev, Mon Jun 29 2015 99d5d9341830945f7080537ddd3bbd79c4aa1732
+   * doc/conf.py, lib/Makefile: update method of retrieving current version
+   * lib/get_version.py: no longer needed, removed
+
 2015-10-05  Michael R. Crusoe  <crusoe@ucdavis.edu>
 
    * lib/magic: add file extensions, one media type, and a better comment

doc/conf.py

@@ -57,16 +57,9 @@
 
 # The full version, including alpha/beta/rc tags.
 
-sys.path.insert(0, '../')
-import versioneer
-versioneer.VCS = 'git'
-versioneer.versionfile_source = '../khmer/_version.py'
-versioneer.versionfile_build = '../khmer/_version.py'
-versioneer.tag_prefix = 'v'  # tags are like v1.2.0
-versioneer.parentdir_prefix = '..'
-release = versioneer.get_version()
-del versioneer
-sys.path.remove('../')
+from khmer._version import get_versions
+release = get_versions()['version']
+del get_versions
 
 # The short X.Y version.