[med-svn] [ariba] 03/03: Merge tag 'upstream/2.7.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 fac2e5ad2887bd674487fbc46a3596d54c17dc8d
Merge: f663204 5ee95ba
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Tue Jan 17 12:47:36 2017 +0100

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

 ariba/__init__.py                                  |   2 +
 ariba/common.py                                    |  25 +++++
 ariba/megares_data_finder.py                       |  68 ++++++++++++
 ariba/megares_zip_parser.py                        | 119 +++++++++++++++++++++
 ariba/ref_genes_getter.py                          |  38 +++----
 .../data/megares_zip_parse_extract_files_ok.zip    | Bin 0 -> 1328 bytes
 ...megares_zip_parse_extract_files_one_missing.zip | Bin 0 -> 1116 bytes
 .../data/megares_zip_parser_load_annotations.csv   |   3 +
 .../megares_zip_parser_load_header_mappings.tsv    |   3 +
 .../data/megares_zip_parser_write_files.expect.fa  |   6 ++
 .../data/megares_zip_parser_write_files.expect.tsv |   3 +
 .../megares_annotations_v1.01.csv                  |   4 +
 .../megares_database_v1.01.fasta                   |   6 ++
 .../megares_to_external_header_mappings_v1.01.tsv  |   4 +
 ariba/tests/megares_data_finder_test.py            |  36 +++++++
 ariba/tests/megares_zip_parser_test.py             |  84 +++++++++++++++
 scripts/ariba                                      |   2 +-
 setup.py                                           |   3 +-
 18 files changed, 385 insertions(+), 21 deletions(-)

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