Skip to content

Commit

Permalink
chore: Change to BSD-3-Clause license
Browse files Browse the repository at this point in the history
  • Loading branch information
dalcinl committed Jul 22, 2024
1 parent b0218c3 commit 3f83f4d
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 22 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ Release 4.0.0 [2024-XX-XX]

* Miscellaneous:

+ The project is now licenced under the BSD-3-Clause license. This
change is fairly inconsequential for users and distributors. It
simply adds an additional clause against using contributor names
for promotional purposes without their consent.

+ Add a new guidelines section to documentation laying out new fair
play rules. These rules ask companies and outside developers to
refrain from reusing the ``mpi4py`` name in unaffiliated projects,
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ message: Please cite this software using the metadata from 'preferred-citation'.

title: MPI for Python
abstract: Python bindings for MPI
license: BSD-2-Clause
license: BSD-3-Clause
url: https://mpi4py.github.io
doi: 10.5281/zenodo.5645087
repository-code: https://github.com/mpi4py/mpi4py
Expand Down
38 changes: 20 additions & 18 deletions LICENSE.rst
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
Copyright (c) 2024, Lisandro Dalcin.
Copyright (c) 2024, Lisandro Dalcin

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3. Neither the name of the copyright holder nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion conf/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def get_readme(settings=None): # noqa: ARG001

description = "Python bindings for MPI"
requires_python = ">=3.6"
license = "BSD-2-Clause"
license = "BSD-3-Clause"
authors = [
{"name": "Lisandro Dalcin", "email": "[email protected]"},
]
Expand Down
2 changes: 1 addition & 1 deletion conf/metadata.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "mpi4py"
dynamic = ["version", "readme"]
description = "Python bindings for MPI"
requires-python = ">=3.6"
license = {text = 'BSD-2-Clause'}
license = {text = 'BSD-3-Clause'}
authors = [
{name = "Lisandro Dalcin", email = "[email protected]"},
]
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ project(
files('conf' / 'metadata.py'), 'version',
check: true,
).stdout().strip(),
license: 'BSD-2-Clause',
license: 'BSD-3-Clause',
meson_version: '>=1.0.0',
)

Expand Down

0 comments on commit 3f83f4d

Please sign in to comment.