[med-svn] [fastaq] 01/04: Imported Upstream version 3.12.1

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

sascha-guest pushed a commit to branch master
in repository fastaq.

commit bc6525880d385f4c3e1ec13e6b7176dabe1f9707
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Wed Apr 20 09:32:27 2016 +0000

    Imported Upstream version 3.12.1
---
 pyfastaq/__init__.py        | 10 +++++++++-
 pyfastaq/common.py          |  1 -
 pyfastaq/runners/version.py |  4 ++--
 setup.py                    |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pyfastaq/__init__.py b/pyfastaq/__init__.py
index 8f176ae..5ab54d0 100644
--- a/pyfastaq/__init__.py
+++ b/pyfastaq/__init__.py
@@ -1,6 +1,14 @@
+from pkg_resources import get_distribution
+
+try:
+    __version__ = get_distribution('pyfastaq').version
+except:
+    __version__ = 'local'
+
+
+
 __all__ = [
     'caf',
-    'common',
     'genetic_codes',
     'utils',
     'sequences',
diff --git a/pyfastaq/common.py b/pyfastaq/common.py
deleted file mode 100644
index 1c5007f..0000000
--- a/pyfastaq/common.py
+++ /dev/null
@@ -1 +0,0 @@
-version = '3.12.0'
diff --git a/pyfastaq/runners/version.py b/pyfastaq/runners/version.py
index 3596510..5f776a0 100644
--- a/pyfastaq/runners/version.py
+++ b/pyfastaq/runners/version.py
@@ -1,4 +1,4 @@
-from pyfastaq import common
+import pyfastaq
 
 def run(description):
-    print(common.version)
+    print(pyfastaq.__version__)
diff --git a/setup.py b/setup.py
index 50533b3..50f19c9 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='pyfastaq',
-    version='3.12.0',
+    version='3.12.1',
     description='Script to manipulate FASTA and FASTQ files, plus API for developers',
     packages = find_packages(),
     author='Martin Hunt',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fastaq.git