Skip to content

Commit 44733fc

Browse files
authored
Add licenses, make it LGPLv2.1+ contributions going forward (#4219)
* Change pakcage LICENSE to GPLv3+ * Make all future contributions LGPLv2.1+
1 parent ac30c88 commit 44733fc

11 files changed

Lines changed: 1230 additions & 77 deletions

File tree

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ PR Checklist
1010
- [ ] Docs?
1111
- [ ] CHANGELOG updated?
1212
- [ ] Issue raised/referenced?
13+
14+
## Developers certificate of origin
15+
- [ ] I certify that this contribution is covered by the LGPLv2.1+ license as defined in our [LICENSE](https://github.com/MDAnalysis/mdanalysis/blob/develop/LICENSE) and adheres to the [**Developer Certificate of Origin**](https://developercertificate.org/).

LICENSE

Lines changed: 1206 additions & 0 deletions
Large diffs are not rendered by default.

README.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,11 @@ The latest release can be **installed via pip or conda** as
7373
described in the `Installation Quick Start`_.
7474

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

7982

8083
Contributing

maintainer/conda/MDAnalysis/README.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

maintainer/conda/MDAnalysis/build.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

maintainer/conda/MDAnalysis/meta.yaml

Lines changed: 0 additions & 54 deletions
This file was deleted.

package/CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ Enhancements
2929
(Issue #3546)
3030

3131
Changes
32+
* Package license has been updated to GPLv3+ to better reflect the
33+
compatibility of GPLv2+ with Apache and GPLv3 licenced codes (PR #4219).
34+
* All new contributions are now made under LGPLv2.1+ (PR #4219).
3235
* Support for GSD is now limited to version 3.0.1 and above. Alongside this
3336
change, support for schema 1.3 files has been dropped (PR #4153)
3437
* Add definition of ts.data['time'] in LAMMPSDump Reader (Issue #3546)

package/doc/sphinx/source/index.rst

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,10 @@ Source Code
141141
===========
142142

143143
**Source code** is available from
144-
https://github.com/MDAnalysis/mdanalysis/ under the `GNU Public
145-
Licence, version 2`_. Obtain the sources with `git`_.
144+
https://github.com/MDAnalysis/mdanalysis/ and is packaged under the
145+
`GNU Public Licence, version 3 or any later version`_. Individual components
146+
of the source code are provided under GPL compatible licenses, details can be
147+
found in the `MDAnalysis license file`_. Obtain the sources with `git`_.
146148

147149
.. code-block:: bash
148150
@@ -152,8 +154,10 @@ Licence, version 2`_. Obtain the sources with `git`_.
152154
The `User Guide`_ provides more information on how to
153155
`install the development version`_ of MDAnalysis.
154156

155-
.. _GNU Public Licence, version 2:
156-
http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
157+
.. _GNU Public Licence, version 3 or any later version:
158+
https://www.gnu.org/licenses/gpl-3.0.en.html
159+
.. _MDAnalysis license file:
160+
https://github.com/MDAnalysis/mdanalysis/blob/develop/LICENSE
157161
.. _git: https://git-scm.com/
158162
.. _`install the development version`: https://userguide.mdanalysis.org/stable/installation.html#development-versions
159163

package/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ classifiers = [
5656
'Development Status :: 6 - Mature',
5757
'Environment :: Console',
5858
'Intended Audience :: Science/Research',
59-
'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
59+
'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
6060
'Operating System :: POSIX',
6161
'Operating System :: MacOS :: MacOS X',
6262
'Operating System :: Microsoft :: Windows',

package/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ def long_description(readme):
573573
'Development Status :: 6 - Mature',
574574
'Environment :: Console',
575575
'Intended Audience :: Science/Research',
576-
'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
576+
'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
577577
'Operating System :: POSIX',
578578
'Operating System :: MacOS :: MacOS X',
579579
'Operating System :: Microsoft :: Windows ',
@@ -626,7 +626,7 @@ def long_description(readme):
626626
'Twitter': 'https://twitter.com/mdanalysis',
627627
'Source': 'https://github.com/mdanalysis/mdanalysis',
628628
},
629-
license='GPL-2.0-or-later',
629+
license='GPL-3.0-or-later',
630630
classifiers=CLASSIFIERS,
631631
provides=['MDAnalysis'],
632632
packages=find_packages(),

0 commit comments

Comments
 (0)