[med-svn] [ariba] 04/06: New upstream version 2.6.1+ds

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository ariba.

commit f56815e4e4246b2c1419425c5140e99fdb1270a1
Author: Sascha Steinbiss <satta at debian.org>
Date:   Wed Dec 21 19:13:28 2016 +0000

    New upstream version 2.6.1+ds
---
 ariba/mlst_profile.py                                       |  5 ++---
 ...lst_profile_test.init_multiple_extra_columns.profile.tsv |  3 +++
 ariba/tests/mlst_profile_test.py                            | 13 +++++++++++++
 setup.py                                                    |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ariba/mlst_profile.py b/ariba/mlst_profile.py
index 5a24522..3db2ac3 100644
--- a/ariba/mlst_profile.py
+++ b/ariba/mlst_profile.py
@@ -8,6 +8,7 @@ class MlstProfile:
     def __init__(self, infile, duplicate_warnings=True):
         self.infile = infile
         self.duplicate_warnings = duplicate_warnings
+        self.columns_to_ignore = ['clonal_complex', 'CC', 'Lineage', 'mlst_clade', 'species']
 
         if not os.path.exists(self.infile):
             raise Error('Error! Input file "' + self.infile + '" not found.')
@@ -22,9 +23,7 @@ class MlstProfile:
             if reader.fieldnames[0] != 'ST':
                 raise Error('Error. Expected first column of profile file "' + self.infile + '" to be "ST"')
 
-            self.genes_list = reader.fieldnames[1:]
-            if self.genes_list[-1] == 'clonal_complex':
-                self.genes_list.pop()
+            self.genes_list = [column_name for column_name in reader.fieldnames[1:] if column_name not in self.columns_to_ignore]
 
             for row in reader:
                 type_tuple = tuple(int(row[x]) for x in self.genes_list)
diff --git a/ariba/tests/data/mlst_profile_test.init_multiple_extra_columns.profile.tsv b/ariba/tests/data/mlst_profile_test.init_multiple_extra_columns.profile.tsv
new file mode 100644
index 0000000..966d712
--- /dev/null
+++ b/ariba/tests/data/mlst_profile_test.init_multiple_extra_columns.profile.tsv
@@ -0,0 +1,3 @@
+ST	nusA	rpoB	eno	gltB	lepA	nuoL	nrdA	clonal_complex	CC	Lineage	mlst_clade	species
+1	1	26	2	2	59	8	1	1	CC10	II	123	Bacteria
+2	1	26	2	4	59	2	5	2	CC10	II	123	Bacteria
diff --git a/ariba/tests/mlst_profile_test.py b/ariba/tests/mlst_profile_test.py
index 78241e6..f165816 100644
--- a/ariba/tests/mlst_profile_test.py
+++ b/ariba/tests/mlst_profile_test.py
@@ -19,6 +19,19 @@ class TestMlstProfile(unittest.TestCase):
             (1, 26, 2, 4, 59, 2, 5): 2
         }
         self.assertEqual(expected_dict, profile.profile_to_type)
+		
+    def test_init_multiple_extra_columns(self):
+        '''test init'''
+        infile = os.path.join(data_dir, 'mlst_profile_test.init_multiple_extra_columns.profile.tsv')
+        profile = mlst_profile.MlstProfile(infile)
+        expected_genes = ['nusA', 'rpoB', 'eno', 'gltB', 'lepA', 'nuoL', 'nrdA']
+        self.assertEqual(expected_genes, profile.genes_list)
+        self.assertEqual(set(expected_genes), profile.genes_set)
+        expected_dict = {
+            (1, 26, 2, 2, 59, 8, 1): 1,
+            (1, 26, 2, 4, 59, 2, 5): 2
+        }
+        self.assertEqual(expected_dict, profile.profile_to_type)
 
 
     def test_has_gene(self):
diff --git a/setup.py b/setup.py
index b86afc5..d8af3cc 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@ vcfcall_mod = Extension(
 setup(
     ext_modules=[minimap_mod, fermilite_mod, vcfcall_mod],
     name='ariba',
-    version='2.6.0',
+    version='2.6.1',
     description='ARIBA: Antibiotic Resistance Identification By Assembly',
     packages = find_packages(),
     package_data={'ariba': ['test_run_data/*']},

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