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

Dual license more of Bio.PDB #2242

merged 6 commits into from Nov 4, 2019

Conversation

peterjc
Copy link
Member

@peterjc peterjc commented Aug 30, 2019

This pull request addresses in part issue #898, continuing work on #2212

See also #2240 (MMCIFParser.py) and #2241 (Entity.py), and also waiting to hear from @kokonech for the remaining files under Bio/PDB/.

  • I hereby agree to dual licence this and any previous contributions under both
    the Biopython License Agreement AND the BSD 3-Clause License.

  • I have read the CONTRIBUTING.rst file, have run flake8 locally, and
    understand that AppVeyor and TravisCI will be used to confirm the Biopython unit
    tests and style checks pass with these changes.

  • I have added my name to the alphabetical contributors listings in the files
    NEWS.rst and CONTRIB.rst as part of this pull request, am listed
    already, or do not wish to be listed. (This acknowledgement is optional.)

Original authors Thomas Hamelryck and Eric Talevich (for the unittest
conversion), and the contributors as tracked with version control have
agreed:

 - Andrew Guy (@andrewguy)
   biopython#2212 (comment)
 - Ben Reynwar (@benreynwar)
   biopython#898 (comment)
 - Bernhard C. Thiel (@Bernhard10)
   biopython#968
 - Carlos Pena (@carlosp420)
   biopython#898 (comment)
 - Chris Rands (@chris-rands)
   biopython#1301
 - Christian Brueffer (@cbrueffer)
   biopython#898 (comment)
 - Eric Talevich (@etal)
   biopython#898 (comment)
 - Francesco Gastaldello (@Gasta88)
   biopython#1063
 - Gokcen Eraslan (@gokceneraslan)
   biopython#898 (comment)
 - Jack Twilley (@mathuin)
   biopython#1049 (comment)
 - Jeroen Van Goey (@BioGeek)
   biopython#898 (comment)
 - Joe Greener (@jgreener64)
   biopython#1393
 - Joerg Schaarschmidt (@schaarj)
   biopython#1567
 - João Rodrigues (@JoaoRodrigues)
   biopython#898 (comment)
 - Kian Ho (@kianho)
   biopython#898 (comment)
 - Kristian Davidsen (@krdav)
   biopython#898 (comment)
 - Kristian Rother (@krother)
   biopython#898 (comment)
 - Lenna Peterson (@lennax)
   biopython#898 (comment)
 - Markus Piotrowski (@MarkusPiotrowski)
   biopython#898 (comment)
 - Milind Luthra (@milindl)
   biopython#1020
 - Nick Negretti (@nimne)
   biopython#1768 (comment)
 - Peter Cock (@peterjc)
   biopython#898 (comment)
 - Rasmus Fonseca (@RasmusFonseca)
   biopython#1171 (comment)
 - Siong Kong (@siongkong)
   biopython#1516

 - Stefans Mezulis (@StefansM)
   biopython#1445
 - Thomas Hamelryck (CVS username nisse)
   https://mailman.open-bio.org/pipermail/biopython/2018-September/016546.html
Original author Kristian Rother and the contributors since as tracked
by version control have agreed:

 - Carlos Pena (@carlosp420)
   biopython#898 (comment)
 - Christian Brueffer (@cbrueffer)
   biopython#898 (comment)
 - Connor McCoy (@cmccoy)
   biopython#898 (comment)
 - David Cain (@DavidCain)
   biopython#898 (comment)
 - Eric Talevich (@etal)
   biopython#898 (comment)
 - Hector Martinez (@hectormartinezdev)
   biopython#2212 (comment)
 - Jacek Śmietański (@dadoskawina)
   biopython#898 (comment)
 - Joe Greener (@jgreener64)
   biopython#1393
 - Kristian Rother (@krother)
   biopython#898 (comment)
 - Lewis A. Marshall (@lewisamarshall)
   biopython#1432
 - Michael Hoffman (@michaelmhoffman)
   biopython#898 (comment)
 - Michiel de Hoon (@mdehoon)
   biopython#898 (comment)
 - @morrme
   biopython#1172 (comment)
 - Peter Cock (@peterjc)
   biopython#898 (comment)
 - Sergei Lebedev (@superbobry)
   biopython#898 (comment)
 - Sergio Valqui (@svalqui)
   biopython#1749
 - Thomas Hamelryck (CVS username nisse)
   https://mailman.open-bio.org/pipermail/biopython/2018-September/016546.html
 - Travis Wrightsman (@twrightsman)
   biopython#898 (comment)
 - Wayne Decatur (@fomightez)
   biopython#898 (comment)
Original author Thomas Hamelryck and all the contributors since as tracked
with version control have agreed:

 - Andrew Guy (@andrewguy)
   biopython#2212 (comment)
 - Brad Chapman (@chapmanb)
   http://mailman.open-bio.org/pipermail/biopython-dev/2013-July/019903.html
 - Carlos Pena (@carlosp420)
   biopython#898 (comment)
 - Chaitanya Gupta (@iCHAIT)
   biopython#898 (comment)
 - Chris Rands (@chris-rands)
   biopython#1301
 - chrismit (@Chris7)
   biopython#898 (comment)
 - Christian Brueffer (@cbrueffer)
   biopython#898 (comment)
 - Eric Talevich (@etal)
   biopython#898 (comment)
 - Francesco Gastaldello (@Gasta88)
   biopython#1063
 - Gokcen Eraslan (@gokceneraslan)
   biopython#898 (comment)
 - Jeroen Van Goey (@BioGeek)
   biopython#898 (comment)
 - Joe Greener (@jgreener64)
   biopython#1393
 - João Rodrigues (@JoaoRodrigues)
   biopython#898 (comment)
 - Kian Ho (@kianho)
   biopython#898 (comment)
 - Kristian Davidsen (@krdav)
   biopython#898 (comment)
 - Lenna Peterson (@lennax)
   biopython#898 (comment)
 - Nick Negretti (@nimne)
   biopython#1768 (comment)
 - Peter Cock (@peterjc)
   biopython#898 (comment)
 - Sergei Lebedev (@superbobry)
   biopython#898 (comment)
 - Sergio Valqui (@svalqui)
   biopython#1749
 - Thomas Hamelryck (CVS username nisse)
   https://mailman.open-bio.org/pipermail/biopython/2018-September/016546.html
 - Travis Wrightsman (@twrightsman)
   biopython#898 (comment)
 - Wayne Decatur (@fomightez)
   biopython#898 (comment)
 - Wibowo Arindrarto (@bow)
   biopython#898 (comment)
Original author Thomas Hamelryck and all the contributors since as tracked
with version control have agreed:

 - Adhemar Zerlotini (@azneto)
   biopython#1412 (comment)
 - Brad Chapman (@chapmanb)
   http://mailman.open-bio.org/pipermail/biopython-dev/2013-July/019903.html
 - Brian Osborne (@bosborne)
   biopython#898 (comment)
 - Christian Brueffer (@cbrueffer)
   biopython#898 (comment)
 - Connor McCoy (@cmccoy)
   biopython#898 (comment)
 - jchang (@jefftc)
   biopython#898 (comment)
 - Michiel de Hoon (@mdehoon)
   biopython#898 (comment)
 - @morrme
   biopython#1172 (comment)
 - Peter Cock (@peterjc)
   biopython#898 (comment)
 - Sergei Lebedev (@superbobry)
   biopython#898 (comment)
 - Suresh Panneerselvam (@Amrithasuresh)
   biopython#1575
 - Thomas Hamelryck (CVS username nisse)
   https://mailman.open-bio.org/pipermail/biopython/2018-September/016546.html
@codecov
Copy link

codecov bot commented Aug 30, 2019

Codecov Report

Merging #2242 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2242   +/-   ##
=======================================
  Coverage   84.89%   84.89%           
=======================================
  Files         321      321           
  Lines       51942    51942           
=======================================
  Hits        44095    44095           
  Misses       7847     7847
Impacted Files Coverage Δ
Bio/PDB/PDBList.py 16.45% <ø> (ø) ⬆️
Bio/PDB/Entity.py 89.1% <ø> (ø) ⬆️
Bio/PDB/DSSP.py 57.95% <ø> (ø) ⬆️
Bio/SVDSuperimposer/__init__.py 87.14% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c582c56...2fcd8c0. Read the comment docs.

Original author Thomas Hamelryck and all the contributors since as tracked
with version control have agreed:

 - Adhemar Zerlotini (@azneto)
   biopython#1412 (comment)
 - Alexander (@asford)
   biopython#2212 (comment)
 - @Amrithasuresh
   biopython#1575
 - Andrew Guy (@andrewguy)
   biopython#2212 (comment)
 - Ben Reynwar (@benreynwar)
   biopython#898 (comment)
 - Bernhard C. Thiel (@Bernhard10)
   biopython#968
 - Brad Chapman (@chapmanb)
   http://mailman.open-bio.org/pipermail/biopython-dev/2013-July/019903.html
 - Brian Osborne (@bosborne)
   biopython#898 (comment)
 - Carlos Pena (@carlosp420)
   biopython#898 (comment)
 - Christian Brueffer (@cbrueffer)
   biopython#898 (comment)
 - Connor McCoy (@cmccoy)
   biopython#898 (comment)
 - Eric Talevich (@etal)
   biopython#898 (comment)
 - Francesco Gastaldello (@Gasta88)
   biopython#1063
 - Joe Greener (@jgreener64)
   biopython#1393
 - Joerg Schaarschmidt (@schaarj)
   biopython#1567
 - João Rodrigues (@JoaoRodrigues)
   biopython#898 (comment)
 - Klaus Kopec (@klauskopec)
   biopython#2241 (comment)
 - Michiel de Hoon (@mdehoon)
   biopython#898 (comment)
 - @morrme
   biopython#1172 (comment)
 - Peter Cock (@peterjc)
   biopython#898 (comment)
 - Ralf Stephan (@rwst)
   biopython#1900
 - Sergio Valqui (@svalqui)
   biopython#1749
 - Thomas Hamelryck (CVS username nisse)
   https://mailman.open-bio.org/pipermail/biopython/2018-September/016546.html
See commit b1fe143 to
Bio/PDB/Entity.py for RedMine issue 2777.
@peterjc
Copy link
Member Author

peterjc commented Sep 25, 2019

@JoaoRodrigues would you be able to review this?

@peterjc
Copy link
Member Author

peterjc commented Nov 4, 2019

@jgreener64 do you fancy reviewing this dual-licensing PR, looking at the past PDB contributors?

@jgreener64
Copy link
Contributor

Sure, it looks good to me.

@peterjc
Copy link
Member Author

peterjc commented Nov 4, 2019

Thanks Joe.

@peterjc peterjc merged commit 9490105 into biopython:master Nov 4, 2019
@peterjc peterjc deleted the dual_pdb2 branch November 4, 2019 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants