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

Dual license more of Bio.PDB #2242

Merged
merged 6 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
8 changes: 5 additions & 3 deletions Bio/PDB/DSSP.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Copyright (C) 2002, Thomas Hamelryck (thamelry@binf.ku.dk)
# 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.

r"""Use the DSSP program to calculate secondary structure and accessibility.

Expand Down
9 changes: 5 additions & 4 deletions Bio/PDB/Entity.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Copyright (C) 2002, Thomas Hamelryck (thamelry@binf.ku.dk)
# 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.
"""Base class for Residue, Chain, Model and Structure classes.

It is a simple container class, with list and dictionary like properties.
Expand Down
13 changes: 5 additions & 8 deletions Bio/PDB/PDBList.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/env python

# Copyright 2003, by Kristian Rother. 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.
#
# PDBList.py
#
Expand All @@ -29,9 +29,6 @@
# homepage : http://jaceksmietanski.net
# email : jacek.smietanski@ii.uj.edu.pl
#
# This code is released under the conditions of the Biopython license.
# Please see the LICENSE file that should have been included as part of this
# package.
# It may be distributed freely with respect to the original authors.
# Any maintainer of the Biopython code may change this notice
# when appropriate.
Expand Down
8 changes: 5 additions & 3 deletions Bio/SVDSuperimposer/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Copyright (C) 2002, Thomas Hamelryck (thamelry@vub.ac.be)
# 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.
"""Align on protein structure onto another using SVD alignment.

SVDSuperimposer finds the best rotation and translation to put
Expand Down
1 change: 1 addition & 0 deletions CONTRIB.rst
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ please open an issue on GitHub or mention it on the mailing list.
- Kevin Wu <https://github.com/kevinwuhoo>
- Kian Ho <https://github.com/kianho>
- Kiran Mukhyala <https://github.com/mukhyala>
- Klaus Kopec <https://github.com/klauskopec>
- Konrad Förstner <https://github.com/konrad>
- Konstantin Okonechnikov <k.okonechnikov at domain gmail.com>
- Konstantin Vdovkin <https://github.com/rtf_const>
Expand Down
7 changes: 4 additions & 3 deletions Tests/test_PDB.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
# Converted by Eric Talevich from an older unit test copyright 2002
# by Thomas Hamelryck.
#
# 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.

"""Unit tests for the Bio.PDB module."""
from __future__ import print_function
Expand Down