Move version finding code into the util directory.

Mostly done because I already have test code in
htsworkflow.util.test

diff --git a/htsworkflow/pipelines/desplit_fastq.py b/htsworkflow/pipelines/desplit_fastq.py
index 0624aaa290a170a57593d85f07b0b642a1743e46..2ad853c1fe2053f91ffaf19268264b159798e520 100644 (file)
--- a/htsworkflow/pipelines/desplit_fastq.py
+++ b/htsworkflow/pipelines/desplit_fastq.py
@@ -7,7 +7,7 @@ import os
 from optparse import OptionParser
 import sys
 
-from htsworkflow.version import version
+from htsworkflow.util.version import version
 from htsworkflow.util.opener import autoopen
 from htsworkflow.util.conversion import parse_slice
 

diff --git a/htsworkflow/pipelines/qseq2fastq.py b/htsworkflow/pipelines/qseq2fastq.py
index 2f017eb2dc0f4817448b4bae14eebd5b2657772f..c33d0143228568b36d216986bf0aad47f60d57b9 100644 (file)
--- a/htsworkflow/pipelines/qseq2fastq.py
+++ b/htsworkflow/pipelines/qseq2fastq.py
@@ -8,7 +8,7 @@ import numpy
 import sys
 import tarfile
 
-from htsworkflow.version import version
+from htsworkflow.util.version import version
 from htsworkflow.util.conversion import parse_slice
 
 

diff --git a/htsworkflow/pipelines/srf2fastq.py b/htsworkflow/pipelines/srf2fastq.py
index ab86342ce6d2108a95811cfb5f9a134f17affc6d..0d895d9e4b18c8fbb968da470639df8808424339 100644 (file)
--- a/htsworkflow/pipelines/srf2fastq.py
+++ b/htsworkflow/pipelines/srf2fastq.py
@@ -7,7 +7,7 @@ from subprocess import Popen, PIPE
 import sys
 
 from htsworkflow.util.opener import autoopen
-from htsworkflow.version import version
+from htsworkflow.util.version import version
 
 LOGGER = logging.getLogger(__name__)
 

diff --git a/htsworkflow/util/test/test_version.py b/htsworkflow/util/test/test_version.py
new file mode 100644 (file)
index 0000000..212f124
--- /dev/null
+++ b/htsworkflow/util/test/test_version.py
@@ -0,0 +1,21 @@
+from unittest2 import TestCase
+
+from htsworkflow.util import version
+
+class TestVersion(TestCase):
+    def test_version(self):
+        long_version = version.version()
+        self.assertTrue(long_version)
+        self.assertEqual(long_version.project_name, 'htsworkflow')
+        self.assertTrue(long_version.version)
+        
+
+def suite():
+    from unittest2 import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTest(defaultTestLoader.loadTestsFromTestCase(TestVersion))
+    return suite
+
+if __name__ == "__main__":
+    from unittest2 import main
+    main(defaultTest="suite")

diff --git a/htsworkflow/util/version.py b/htsworkflow/util/version.py
new file mode 100644 (file)
index 0000000..8097edb
--- /dev/null
+++ b/htsworkflow/util/version.py
@@ -0,0 +1,21 @@
+import logging
+
+LOGGER = logging.getLogger(__name__)
+
+def version():
+    """Return version number
+    """
+    version = None
+    try:
+        import pkg_resources
+    except ImportError, e:
+        LOGGER.error("Can't find version number, please install setuptools")
+        raise e
+
+    try:
+        version = pkg_resources.get_distribution("htsworkflow")
+    except pkg_resources.DistributionNotFound, e:
+        LOGGER.error("Package not installed")
+
+    return version
+

diff --git a/htsworkflow/version.py b/htsworkflow/version.py
deleted file mode 100644 (file)
index 8097edb..0000000
--- a/htsworkflow/version.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import logging
-
-LOGGER = logging.getLogger(__name__)
-
-def version():
-    """Return version number
-    """
-    version = None
-    try:
-        import pkg_resources
-    except ImportError, e:
-        LOGGER.error("Can't find version number, please install setuptools")
-        raise e
-
-    try:
-        version = pkg_resources.get_distribution("htsworkflow")
-    except pkg_resources.DistributionNotFound, e:
-        LOGGER.error("Package not installed")
-
-    return version
-