Skip to content

Commit

Permalink
Separate the patent clause from the license into its own file (Plasma…
Browse files Browse the repository at this point in the history
…Py#1686)

* Copy current license to licenses folder

* Split license and patent grant

* Link to license from PATENT.md

* Update license links and information

* Remove section header

* Add changelog entry

* Move old license to folder

* Update license in CITATION.cff
  • Loading branch information
namurphy authored Aug 23, 2022
1 parent 6a6cc70 commit 110c862
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 32 deletions.
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ keywords:
- physics
- particles
- science
license: BSD-3-Clause-Patent
license: BSD-3-Clause
cff-version: 1.2.0
authors:
- given-names: Nicholas
Expand Down
27 changes: 0 additions & 27 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,6 @@ modification, are permitted provided that the following conditions are met:
to endorse or promote products derived from this software without specific
prior written permission.

Subject to the terms and conditions of this license, each copyright
holder and contributor hereby grants to those receiving rights under
this license a perpetual, worldwide, non-exclusive, no-charge,
royalty-free, irrevocable (except for failure to satisfy the
conditions of this license) patent license to make, have made, use,
offer to sell, sell, import, and otherwise transfer this software,
where such license applies only to those patent claims, already
acquired or hereafter acquired, licensable by such copyright holder or
contributor that are necessarily infringed by:

(a) their Contribution(s) (the licensed copyrights of copyright
holders and non-copyrightable additions of contributors, in source or
binary form) alone; or

(b) combination of their Contribution(s) with the work of authorship
to which such Contribution(s) was added by such copyright holder or
contributor, if, at the time the Contribution is added, such addition
causes such combination to be necessarily infringed. The patent
license shall not apply to any other combinations which include the
Contribution.

Except as expressly stated above, no rights or licenses from any
copyright holder or contributor is granted under this license, whether
expressly, by implication, estoppel or otherwise.

## Disclaimer

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
Expand Down
28 changes: 28 additions & 0 deletions PATENT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Patent grant

[license]: ./LICENSE.md

Subject to the terms and conditions of this [license], each copyright
holder and contributor hereby grants to those receiving rights under
this license a perpetual, worldwide, non-exclusive, no-charge,
royalty-free, irrevocable (except for failure to satisfy the
conditions of this license) patent license to make, have made, use,
offer to sell, sell, import, and otherwise transfer this software,
where such license applies only to those patent claims, already
acquired or hereafter acquired, licensable by such copyright holder or
contributor that are necessarily infringed by:

(a) their Contribution(s) (the licensed copyrights of copyright
holders and non-copyrightable additions of contributors, in source or
binary form) alone; or

(b) combination of their Contribution(s) with the work of authorship
to which such Contribution(s) was added by such copyright holder or
contributor, if, at the time the Contribution is added, such addition
causes such combination to be necessarily infringed. The patent
license shall not apply to any other combinations which include the
Contribution.

Except as expressly stated above, no rights or licenses from any
copyright holder or contributor is granted under this license, whether
expressly, by implication, estoppel or otherwise.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

[Anaconda Navigator]: https://docs.anaconda.com/anaconda/navigator/index.html
[Astropy]: https://www.astropy.org
[3-clause BSD license]: ./LICENSE.md
[calendar]: https://calendar.google.com/calendar/embed?src=c_sqqq390s24jjfjp3q86pv41pi8%40group.calendar.google.com&ctz=America%2FNew_York
[citation instructions]: https://docs.plasmapy.org/en/latest/about/citation.html
[code of conduct]: http://docs.plasmapy.org/en/latest/CODE_OF_CONDUCT.html
Expand Down Expand Up @@ -57,6 +58,7 @@
[PlasmaPy Community on Zenodo]: https://zenodo.org/communities/plasmapy
[PlasmaPy]: https://www.plasmapy.org
[PlasmaPy's online documentation]: https://docs.plasmapy.org
[protections against software patents]: ./PATENT.md
[Python]: https://www.python.org
[Smithsonian Institution]: https://www.si.edu
[submit a bug report]: https://github.com/PlasmaPy/PlasmaPy/issues/new?assignees=&labels=&template=Bug_report.md
Expand Down Expand Up @@ -201,8 +203,8 @@ computational magnetohydrodynamics.

## License

PlasmaPy is permissively licensed under a [3-clause BSD license with
added protections against software patents](LICENSE.md).
PlasmaPy is permissively licensed under a [3-clause BSD license] with
added [protections against software patents].

## Citing PlasmaPy

Expand Down
1 change: 1 addition & 0 deletions changelog/1686.doc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Split the patent clause from the license into its own file.
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": "https://doi.org/10.5063/schema/codemeta-2.0",
"@type": "SoftwareSourceCode",
"license": "https://spdx.org/licenses/BSD-2-Clause-Patent",
"license": "https://spdx.org/licenses/BSD-3-Clause",
"codeRepository": "https://github.com/PlasmaPy/plasmapy",
"contIntegration": "https://dev.azure.com/plasmapy/PlasmaPy",
"issueTracker": "https://github.com/PlasmaPy/PlasmaPy/issues",
Expand Down
55 changes: 55 additions & 0 deletions licenses/PlasmaPy_LICENSE_Oct2017_to_Aug2022.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# PlasmaPy License

Copyright (c) 2015–2022, PlasmaPy Developers.

Redistribution and use in source and binary forms, with or without
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.

* 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.

* Neither the name of PlasmaPy nor the names of its contributors may be used
to endorse or promote products derived from this software without specific
prior written permission.

Subject to the terms and conditions of this license, each copyright
holder and contributor hereby grants to those receiving rights under
this license a perpetual, worldwide, non-exclusive, no-charge,
royalty-free, irrevocable (except for failure to satisfy the
conditions of this license) patent license to make, have made, use,
offer to sell, sell, import, and otherwise transfer this software,
where such license applies only to those patent claims, already
acquired or hereafter acquired, licensable by such copyright holder or
contributor that are necessarily infringed by:

(a) their Contribution(s) (the licensed copyrights of copyright
holders and non-copyrightable additions of contributors, in source or
binary form) alone; or

(b) combination of their Contribution(s) with the work of authorship
to which such Contribution(s) was added by such copyright holder or
contributor, if, at the time the Contribution is added, such addition
causes such combination to be necessarily infringed. The patent
license shall not apply to any other combinations which include the
Contribution.

Except as expressly stated above, no rights or licenses from any
copyright holder or contributor is granted under this license, whether
expressly, by implication, estoppel or otherwise.

## Disclaimer

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 setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ author = PlasmaPy Community
description = Python package for plasma physics
long_description = file: README.md
long_description_content_type = text/markdown
license = BSD+Patent
license = BSD-3-Clause
license_file = LICENSE.md
url = https://www.plasmapy.org
project_urls =
Expand Down

0 comments on commit 110c862

Please sign in to comment.