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

Switch to LGPLv2.1+ #41

Merged
merged 2 commits into from
Nov 25, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The rules for this file:
* accompany each entry with github issue/PR number (Issue #xyz)
-->

## [Unreleased]
## [1.2.0] - 2024-11-22

### Authors
- fiona-naughton
Expand All @@ -32,6 +32,7 @@ The rules for this file:
- update changelog (PR #32)
- In line with SPEC0, the minimum supported Python version is now 3.10
- Minimum support MDAnalysis version has been raised to 2.1.0
- License changed to LGPLv2.1+

## [1.1.0] - 2024-01-11

Expand Down
660 changes: 413 additions & 247 deletions LICENSE

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ waterdynamics
| **Latest release** | [![Last release tag][badge_release]][url_latest_release] ![GitHub commits since latest release (by date) for a branch][badge_commits_since] |
| :----------------- | :------- |
| **Status** | [![GH Actions Status][badge_actions]][url_actions] [![codecov][badge_codecov]][url_codecov] [![Docs][badge_docs]][docs_workflow] |
| **Community** | [![License: GPL v2][badge_license]][url_license] [![Powered by MDAnalysis][badge_mda]][url_mda]|
| **Community** | [![Powered by MDAnalysis][badge_mda]][url_mda]|

[badge_actions]: https://github.com/MDAnalysis/waterdynamics/actions/workflows/gh-ci.yaml/badge.svg
[badge_codecov]: https://codecov.io/gh/MDAnalysis/waterdynamics/branch/main/graph/badge.svg
Expand All @@ -19,7 +19,6 @@ waterdynamics
[url_codecov]: https://codecov.io/gh/MDAnalysis/waterdynamics/branch/main
[url_docs]: https://waterdynamics.readthedocs.io/en/latest/?badge=latest
[url_latest_release]: https://github.com/MDAnalysis/waterdynamics/releases
[url_license]: https://www.gnu.org/licenses/gpl-2.0
[url_mda]: https://www.mdanalysis.org

Analysis of water dynamics in molecular dynamics trajectories and water interactions with other molecules.
Expand Down Expand Up @@ -100,7 +99,7 @@ pip install ".[test,doc]"
### Copyright

The waterdynamics source code is hosted at https://github.com/MDAnalysis/waterdynamics
and is available under the GNU General Public License, version 2 (see the file [LICENSE](https://github.com/MDAnalysis/waterdynamics/blob/main/LICENSE)).
and is available under the Lesser GNU General Public License, version 2.1 or later (see the file [LICENSE](https://github.com/MDAnalysis/waterdynamics/blob/main/LICENSE)).

Copyright (c) 2023, MDAnalysis

Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ classifiers = [
"Development Status :: 6 - Mature",
"Environment :: Console",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
"License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)",
"Programming Language :: C",
"Programming Language :: Python",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Scientific/Engineering",
"Topic :: Software Development :: Libraries :: Python Modules",
]
Expand Down
2 changes: 1 addition & 1 deletion waterdynamics/tests/test_waterdynamics.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 waterdynamics/waterdynamics.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
Loading