[med-svn] [python-dendropy] 02/03: Merge tag 'upstream/4.2.0+dfsg'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository python-dendropy.

commit 5ca0d651fb2c5dd462a770fc268848a469bcc086
Merge: 9aa6ad3 aa688cf
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jan 9 18:24:22 2017 +0100

    Merge tag 'upstream/4.2.0+dfsg'
    
    Upstream version 4.2.0+dfsg

 CHANGES.rst                                        |   18 +-
 DendroPy.egg-info/PKG-INFO                         |    4 +-
 DendroPy.egg-info/SOURCES.txt                      |    4 +
 DendroPy.egg-info/requires.txt                     |    2 +-
 PKG-INFO                                           |    4 +-
 applications/sumtrees/sumtrees.py                  |   82 +-
 dendropy/__init__.py                               |    4 +-
 dendropy/calculate/phylogeneticdistance.py         |   49 +-
 dendropy/calculate/popgenstat.py                   |   37 +-
 dendropy/calculate/profiledistance.py              |  327 ++
 dendropy/calculate/treecompare.py                  |  135 +-
 dendropy/dataio/newickreader.py                    |   46 +-
 dendropy/dataio/newickyielder.py                   |    2 +-
 dendropy/dataio/nexusreader.py                     |    4 +-
 dendropy/dataio/nexuswriter.py                     |   15 +-
 dendropy/dataio/nexusyielder.py                    |    5 +-
 dendropy/datamodel/basemodel.py                    |    5 +-
 dendropy/datamodel/taxonmodel.py                   |   14 +-
 dendropy/datamodel/treemodel.py                    |   43 +-
 dendropy/interop/paup.py                           |   37 +-
 dendropy/model/coalescent.py                       |    6 +-
 dendropy/model/multispeciescoalescent.py           |  275 ++
 .../other/multispecies_coalescent_test_data.json   | 4680 ++++++++++++++++++++
 dendropy/test/test_dataio_newick_reader_tree.py    |   65 +
 dendropy/test/test_multispeciescoalescent.py       |  307 ++
 dendropy/test/test_phylogenetic_distance_matrix.py |    2 +-
 dendropy/test/test_popgenstat.py                   |   27 +-
 dendropy/utility/error.py                          |   10 +
 dendropy/utility/processio.py                      |   13 +-
 dendropy/utility/timeprocessing.py                 |   10 +-
 setup.py                                           |    6 +
 31 files changed, 6088 insertions(+), 150 deletions(-)

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