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

LGPL switch #4794

Merged
merged 13 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
537 changes: 178 additions & 359 deletions LICENSE

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ described in the `Installation Quick Start`_.

**Source code** is hosted in a git repository at
https://github.com/MDAnalysis/mdanalysis and is packaged under the
GNU General Public License, version 3 or any later version. Invidiual
source code components are provided under a mixture of GPLv3+ compatible
licenses, including LGPLv2.1+ and GPLv2+. Please see the file LICENSE_
for more information.
GNU Lesser General Public License, version 3 or any later version (LGPLv3+).
Invidiual source code components are provided under the
GNU Lesser General Public License, version 2.1 or any later version (LGPLv2.1+).
Please see the file LICENSE_ for more information.


Contributing
Expand Down
6 changes: 3 additions & 3 deletions package/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ Chronological list of authors
External code
-------------

External code (under a GPL-compatible licence) was obtained from
External code (under a LGPL-compatible licence) was obtained from
various sources. The authors (as far as we know them) are listed here.

xdrfile
Expand All @@ -261,9 +261,9 @@ xdrfile
The Gromacs libxdrfile (LGPL-licensed) was used before MDAnalysis
version 0.8.0.
Between MDAnalysis versions 0.8.0 and 0.13.0 libxdrfile was replaced by
libxdrfile2, our GPLv2 enhanced derivative of libxdrfile.
libxdrfile2, our LGPLv2.1+ enhanced derivative of libxdrfile.
Since version 0.14.0 xdr enhanecments were rebased onto Gromacs'
xdrfile 1.1.4 code (now BSD-licensed). Our contributions remain GPLv2
xdrfile 1.1.4 code (now BSD-licensed). Our contributions remain LGPLv2.1+
and were split into files xtc_seek.c, trr_seek.c, xtc_seek.h, and
trr_seek.h, for clarity (xdrfile 1.1.4 code is distributed with minor
modifications). Also for clarity we now name the resulting enhanced
Expand Down
2 changes: 2 additions & 0 deletions package/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ Enhancements
DOI 10.1021/acs.jpcb.7b11988. (Issue #2039, PR #4524)

Changes
* Relicense code contributions from GPLv2+ to LGPLv2.1+
and the package from GPLv3+ to LGPLv3+ (PR #4794)
* only use distopia < 0.3.0 due to API changes (Issue #4739)
* The `fetch_mmtf` method has been removed as the REST API service
for MMTF files has ceased to exist (Issue #4634)
Expand Down
1,532 changes: 1,292 additions & 240 deletions package/LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package/MDAnalysis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
6 changes: 3 additions & 3 deletions package/MDAnalysis/analysis/align.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand All @@ -26,7 +26,7 @@

:Author: Oliver Beckstein, Joshua Adelman
:Year: 2010--2013
:Copyright: GNU Public License v3
:Copyright: Lesser GNU Public License v2.1+

The module contains functions to fit a target structure to a reference
structure. They use the fast QCP algorithm to calculate the root mean
Expand Down Expand Up @@ -1669,4 +1669,4 @@ def get_atoms_byres(g, match_mask=np.logical_not(mismatch_mask)):
logger.error(errmsg)
raise SelectionError(errmsg)

return ag1, ag2
return ag1, ag2
4 changes: 2 additions & 2 deletions package/MDAnalysis/analysis/atomicdistances.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand All @@ -29,7 +29,7 @@

:Author: Xu Hong Chen
:Year: 2023
:Copyright: GNU Public License v3
:Copyright: Lesser GNU Public License v2.1+

This module provides a class to efficiently compute distances between
two groups of atoms with an equal number of atoms over a trajectory.
Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
4 changes: 2 additions & 2 deletions package/MDAnalysis/analysis/bat.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand All @@ -25,7 +25,7 @@

:Author: Soohaeng Yoo Willow and David Minh
:Year: 2020
:Copyright: GNU Public License, v2 or any higher version
:Copyright: Lesser GNU Public License, v2 or any higher version
orbeckst marked this conversation as resolved.
Show resolved Hide resolved

.. versionadded:: 2.0.0

Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/contacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/data/filenames.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
4 changes: 2 additions & 2 deletions package/MDAnalysis/analysis/density.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand All @@ -30,7 +30,7 @@

:Author: Oliver Beckstein
:Year: 2011
:Copyright: GNU Public License v3
:Copyright: Lesser GNU Public License v2.1+

The module provides classes and functions to generate and represent
volumetric data, in particular densities.
Expand Down
4 changes: 2 additions & 2 deletions package/MDAnalysis/analysis/dielectric.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand All @@ -27,7 +27,7 @@

:Authors: Mattia Felice Palermo, Philip Loche
:Year: 2022
:Copyright: GNU Public License v3
:Copyright: Lesser GNU Public License v2.1+
"""

import numpy as np
Expand Down
4 changes: 2 additions & 2 deletions package/MDAnalysis/analysis/diffusionmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand All @@ -26,7 +26,7 @@

:Authors: Eugen Hruska, John Detlefs
:Year: 2016
:Copyright: GNU Public License v2
:Copyright: Lesser GNU Public License v2.1+

This module contains the non-linear dimension reduction method diffusion map.
The eigenvectors of a diffusion matrix represent the 'collective coordinates'
Expand Down
4 changes: 2 additions & 2 deletions package/MDAnalysis/analysis/dihedrals.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand All @@ -25,7 +25,7 @@

:Author: Henry Mull
:Year: 2018
:Copyright: GNU Public License v2
:Copyright: Lesser GNU Public License v2.1+

.. versionadded:: 0.19.0

Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/distances.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/encore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/encore/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/encore/clustering/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/encore/clustering/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/encore/clustering/include/ap.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Copyright (c) 2006-2016 The MDAnalysis Development Team and contributors
(see the file AUTHORS for the full list of names)

Released under the GNU Public Licence, v2 or any higher version
Released under the Lesser GNU Public Licence, v2.1 or any higher version

Please cite your use of MDAnalysis in published work:

Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/encore/clustering/src/ap.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Copyright (c) 2006-2016 The MDAnalysis Development Team and contributors
(see the file AUTHORS for the full list of names)

Released under the GNU Public Licence, v2 or any higher version
Released under the Lesser GNU Public Licence, v2.1 or any higher version

Please cite your use of MDAnalysis in published work:

Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/encore/confdistmatrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/encore/covariance.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/analysis/encore/cutils.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Copyright (c) 2006-2016 The MDAnalysis Development Team and contributors
(see the file AUTHORS for the full list of names)

Released under the GNU Public Licence, v2 or any higher version
Released under the Lesser GNU Public Licence, v2.1 or any higher version

Please cite your use of MDAnalysis in published work:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Copyright (c) 2006-2016 The MDAnalysis Development Team and contributors
(see the file AUTHORS for the full list of names)

Released under the GNU Public Licence, v2 or any higher version
Released under the Lesser GNU Public Licence, v2.1 or any higher version

Please cite your use of MDAnalysis in published work:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
# Released under the Lesser GNU Public Licence, v2.1 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
Expand Down
Loading
Loading