[med-svn] [fastaq] 02/05: Merge tag 'upstream/3.6.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 f9e43d452ccb21555d305f6dde4ad7cf8bc190b3
Merge: d5825d3 08dda22
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Fri Aug 21 08:55:01 2015 +0000

    Merge tag 'upstream/3.6.1'
    
    Upstream version 3.6.1

 pyfastaq/common.py                                 |  2 +-
 pyfastaq/genetic_codes.py                          | 31 +++++++++++
 pyfastaq/intervals.py                              |  7 +++
 pyfastaq/runners/to_fasta.py                       |  4 +-
 pyfastaq/runners/to_orfs_gff.py                    |  2 +-
 pyfastaq/sequences.py                              | 24 +++++++--
 pyfastaq/tasks.py                                  | 60 +++++++++++++++++++++-
 ...o_fasta.strip_after_whitespace_non_unique.in.fa |  6 +++
 ..._fasta.strip_after_whitespace_non_unique.out.fa |  6 +++
 ...st.to_fasta.strip_after_whitespace_unique.in.fa |  6 +++
 ...t.to_fasta.strip_after_whitespace_unique.out.fa |  6 +++
 pyfastaq/tests/data/tasks_test_to_fastg.fasta      |  4 ++
 pyfastaq/tests/data/tasks_test_to_fastg.fastg      |  8 +++
 .../data/tasks_test_to_fastg.ids_to_circularise    |  1 +
 pyfastaq/tests/intervals_test.py                   | 10 ++++
 pyfastaq/tests/sequences_test.py                   | 30 +++++++++++
 pyfastaq/tests/tasks_test.py                       | 45 ++++++++++++++++
 setup.py                                           | 13 ++---
 18 files changed, 248 insertions(+), 17 deletions(-)

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