Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BSD dual license Bio.Nexus #2250

Merged
merged 8 commits into from
Nov 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions Bio/Nexus/Nexus.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# Copyright 2005-2008 by Frank Kauff & Cymon J. Cox. All rights reserved.
# 2014-2015 by Joe Cora (standard data)
# This code is part of the Biopython distribution and governed by its
# license. Please see the LICENSE file that should have been included
# as part of this package.
# Revisions copyright 2014-2015 by Joe Cora (standard data)
#
# Bug reports welcome: fkauff@biologie.uni-kl.de or on Biopython's bugzilla.
# This file is part of the Biopython distribution and governed by your
# choice of the "Biopython License Agreement" or the "BSD 3-Clause License".
# Please see the LICENSE file that should have been included as part of this
# package.

"""Nexus class. Parse the contents of a NEXUS file.

Based upon 'NEXUS: An extensible file format for systematic information'
Expand Down
9 changes: 6 additions & 3 deletions Bio/Nexus/Nodes.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# Copyright 2005-2008 by Frank Kauff & Cymon J. Cox. All rights reserved.
# This code is part of the Biopython distribution and governed by its
# license. Please see the LICENSE file that should have been included
# as part of this package.
#
# This file is part of the Biopython distribution and governed by your
# choice of the "Biopython License Agreement" or the "BSD 3-Clause License".
# Please see the LICENSE file that should have been included as part of this
# package.

"""Linked list functionality for use in Bio.Nexus.

Provides functionality of a linked list.
Expand Down
9 changes: 6 additions & 3 deletions Bio/Nexus/StandardData.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Copyright 2014 Joe Cora.
# Revisions copyright 2017 Peter Cock.
# All rights reserved.
# This code is part of the Biopython distribution and governed by its
# license. Please see the LICENSE file that should have been included
# as part of this package.
#
# This file is part of the Biopython distribution and governed by your
# choice of the "Biopython License Agreement" or the "BSD 3-Clause License".
# Please see the LICENSE file that should have been included as part of this
# package.

"""Objects to represent NEXUS standard data type matrix coding."""
from __future__ import print_function

Expand Down
9 changes: 5 additions & 4 deletions Bio/Nexus/Trees.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Copyright 2005-2008 by Frank Kauff & Cymon J. Cox. All rights reserved.
# This code is part of the Biopython distribution and governed by its
# license. Please see the LICENSE file that should have been included
# as part of this package.
#
# Bug reports welcome: fkauff@biologie.uni-kl.de or on Biopython's bugzilla.
# This file is part of the Biopython distribution and governed by your
# choice of the "Biopython License Agreement" or the "BSD 3-Clause License".
# Please see the LICENSE file that should have been included as part of this
# package.

"""Tree class to handle phylogenetic trees.

Provides a set of methods to read and write newick-format tree descriptions,
Expand Down
9 changes: 6 additions & 3 deletions Bio/Nexus/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# This code is part of the Biopython distribution and governed by its
# license. Please see the LICENSE file that should have been included
# as part of this package.
# Copyright Frank Kauff and Cymon J. Cox 2005. All rights reserved.
#
# This file is part of the Biopython distribution and governed by your
# choice of the "Biopython License Agreement" or the "BSD 3-Clause License".
# Please see the LICENSE file that should have been included as part of this
# package.

"""The Bio.Nexus contains a NEXUS file parser and objects to model this data."""
19 changes: 10 additions & 9 deletions CONTRIB.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ please open an issue on GitHub or mention it on the mailing list.
- Christiam Camacho <https://github.com/christiam>
- Christian Brueffer <christian at domain brueffer.de>
- Christian Zmasek <https://github.com/cmzmasek>
- Chunlei Wu <https://github.com/newgene/>
- Chunlei Wu <https://github.com/newgene>
- Claude Paroz <claude at two (as digit) xlibre dot net>
- Connor McCoy <cmccoy at the dot org domain fhcrc>
- Connor T. Skennerton <https://github.com/ctSkennerton>
Expand Down Expand Up @@ -101,7 +101,7 @@ please open an issue on GitHub or mention it on the mailing list.
- Francesco Gastaldello <https://github.com/Gasta88>
- Francisco Pina-Martins <https://github.com/StuntsPT>
- Franco Caramia <https://github.com/fcaramia>
- Frank Kauff <fkauff at domain duke.edu>
- Frank Kauff <https://github.com/frankkl>
- François Coste <https://github.com/francoiscoste>
- Frederic Sapet <https://github.com/FredericBGA>
- Frederic Sohm <fsms at domain users.sourceforge.net>
Expand All @@ -127,9 +127,9 @@ please open an issue on GitHub or mention it on the mailing list.
- Jason A. Hackney <jhackney at domain stanford.edu>
- Jeff Hussmann <first dot last at gmail dot com>
- Jeffrey Chang <https://github.com/jchang>
- Jeffrey Finkelstein <https://github.com/jfinkels/>
- Jens Thomas <https://github.com/linucks/>
- Jeremy LaBarge <https://github.com/biojerm/biopython>
- Jeffrey Finkelstein <https://github.com/jfinkels>
- Jens Thomas <https://github.com/linucks>
- Jeremy LaBarge <https://github.com/biojerm>
- Jeroen Van Goey <https://github.com/BioGeek>
- Jerven Bolleman <https://github.com/JervenBolleman>
- Jian-Long Huang <https://github.com/jlhg>
Expand Down Expand Up @@ -181,7 +181,7 @@ please open an issue on GitHub or mention it on the mailing list.
- Mateusz Korycinski <https://github.com/mkorycinski>
- Matt Ruffalo <https://github.com/mruffalo>
- Matt Shirley <https://github.com/mdshw5>
- Matteo Sticco <https://github.com/sticken88/>
- Matteo Sticco <https://github.com/sticken88>
- Maximilian Greil <https://github.com/MaxGreil>
- Maximilian Peters <maximili.peters at mail.huji.ac.il>
- Melissa Gymrek <https://github.com/mgymrek>
Expand All @@ -198,9 +198,9 @@ please open an issue on GitHub or mention it on the mailing list.
- Nader Morshed <https://github.com/naderm>
- Nate Sutton <https://github.com/nmsutton>
- Nathan J. Edwards <nje5 at edu domain georgetown>
- Nick Negretti <https://github.com/nimne/>
- Nick Negretti <https://github.com/nimne>
- Nicolas Fontrodona <https://github.com/NFontrodona>
- Nigel Delaney <https://github.com/evolvedmicrobe/>
- Nigel Delaney <https://github.com/evolvedmicrobe>
- Noam Kremen <https://github.com/noamkremen>
- Olivier Morelle <https://github.com/Oli4>
- Oscar G. Garcia <https://github.com/oscarmaestre>
Expand Down Expand Up @@ -235,11 +235,12 @@ please open an issue on GitHub or mention it on the mailing list.
- Sjoerd de Vries <sjoerd at domain nmr.chem.uu.nl>
- Sourav Singh <https://github.com/souravsingh>
- Spencer Bliven <https://github.com/sbliven>
- Stefans Mezulis <https://github.com/StefansM/>
- Stefans Mezulis <https://github.com/StefansM>
- Steve Bond <https://github.com/biologyguy>
- Steve Marshall <https://github.com/hungryhoser>
- Stuart Nelis <https://github.com/biostu24>
- Sunhwan Jo <https://github.com/sunhwan>
- Suresh Panneerselvam <https://github.com/Amrithasuresh>
- Tarcisio Fedrizzi <https://github.com/hcraT>
- Tarjei Mikkelsen <tarjei at domain genome.wi.mit.edu>
- Ted Cybulski <https://github.com/tcyb>
Expand Down
9 changes: 6 additions & 3 deletions Tests/test_Nexus.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
# Revisions copyright 2008 by Frank Kauff. All rights reserved.
# Revisions copyright 2009 by Michiel de Hoon. All rights reserved.
# Revisions copyright 2015 by Joe Cora. All rights reserved.
# This code is part of the Biopython distribution and governed by its
# license. Please see the LICENSE file that should have been included
# as part of this package.
#
# This file is part of the Biopython distribution and governed by your
# choice of the "Biopython License Agreement" or the "BSD 3-Clause License".
# Please see the LICENSE file that should have been included as part of this
# package.

"""Tests for Nexus module."""

from __future__ import print_function
Expand Down