[med-svn] [ariba] 02/03: Merge tag 'upstream/2.10.0+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 6c17042035d3e623b02c1619e2f8cceb590d0df2
Merge: 20ef99a 5fd2631
Author: Sascha Steinbiss <satta at debian.org>
Date:   Wed Jun 28 19:04:38 2017 +0200

    Merge tag 'upstream/2.10.0+ds'
    
    Upstream version 2.10.0+ds

 ariba/__init__.py                                  |  1 +
 ariba/flag.py                                      |  3 ++
 ariba/mic_plotter.py                               |  2 +-
 ariba/ref_preparer.py                              |  8 ++++-
 ariba/reference_data.py                            | 19 +++++++----
 ariba/report_filter.py                             |  3 ++
 ariba/report_flag_expander.py                      | 37 ++++++++++++++++++++++
 ariba/tasks/__init__.py                            |  1 +
 ariba/tasks/expandflag.py                          |  8 +++++
 .../01.filter.check_genes.log                      | 10 +++---
 .../data/reference_data_test_remove_bad_genes.log  | 10 +++---
 ariba/tests/data/report_flag_expander.run.in.tsv   |  3 ++
 ariba/tests/data/report_flag_expander.run.out.tsv  |  3 ++
 ariba/tests/flag_test.py                           |  8 +++++
 ariba/tests/reference_data_test.py                 | 17 ++++++----
 ariba/tests/report_filter_test.py                  | 15 +++++++++
 ariba/tests/report_flag_expander_test.py           | 20 ++++++++++++
 scripts/ariba                                      | 12 +++++++
 setup.py                                           |  2 +-
 19 files changed, 157 insertions(+), 25 deletions(-)

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