[med-svn] [python-htseq] 03/15: Merge tag 'upstream/0.6.1p1'

[Diane Trout]

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

diane-guest pushed a commit to branch master
in repository python-htseq.

commit ae4a1b4daf2181881d9f015a49cf6c83bb32efcf
Merge: 3a7e70e 36c4d8d
Author: Diane Trout <diane at ghic.org>
Date:   Thu Jun 5 17:16:27 2014 -0700

    Merge tag 'upstream/0.6.1p1'
    
    Upstream version 0.6.1p1

 HTSeq/__init__.py                                  |    173 +-
 HTSeq/_version.py                                  |      1 -
 HTSeq/scripts/count.py                             |    135 +-
 PKG-INFO                                           |     19 -
 VERSION                                            |      2 +-
 doc/GenomicArrayOfSets.svg                         |    309 +
 doc/alignments.rst                                 |     32 +-
 doc/cigar.png                                      |    Bin 0 -> 13104 bytes
 doc/count.rst                                      |    184 +-
 doc/counting.rst                                   |    303 +
 doc/features.rst                                   |    106 -
 doc/genomic.rst                                    |      2 +-
 doc/history.rst                                    |     47 +-
 doc/index.rst                                      |      2 +
 doc/install.rst                                    |      2 +-
 doc/make_it                                        |      3 -
 doc/otherparsers.rst                               |    173 +
 doc/overview.rst                                   |     20 +
 doc/tour.rst                                       |    222 +-
 example_data/Homo_sapiens.GRCh37.56_chrom1.gtf     | 197895 ++++++++++++++++++
 example_data/SRR001432_head.bam                    |    Bin 0 -> 12849262 bytes
 example_data/SRR001432_head_sorted.bam             |    Bin 0 -> 11925267 bytes
 example_data/SRR001432_head_sorted.bam.bai         |    Bin 0 -> 2873888 bytes
 .../Saccharomyces_cerevisiae.SGD1.01.56.gtf.gz     |    Bin 0 -> 373439 bytes
 example_data/fastaEx.fa                            |      6 +
 example_data/feature_list.txt                      |      3 +
 example_data/yeast_RNASeq_excerpt.sam              |  25019 +++
 example_data/yeast_RNASeq_excerpt_sequence.txt     |  99996 +++++++++
 setup.cfg                                          |      5 -
 setup.py                                           |      2 +-
 src/HTSeq/_HTSeq.pyx                               |     45 +-
 test/test.py                                       |     36 +
 test/tss_test.py                                   |     35 +
 todo.txt                                           |      8 +
 34 files changed, 324412 insertions(+), 373 deletions(-)

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