Skip to content

Commit

Permalink
Update project license statement to reflect project discussion.
Browse files Browse the repository at this point in the history
These changes come from discussion at jupyter#37 and on the mailing list thread https://groups.google.com/forum/#!topic/jupyter/vZpWgw8zKdc

Summary of changes:

* Update primary license name to 3-Clause BSD License to reflect the opensource.org and spdx.org primary names for the license

* Make copyright owner “Project Jupyter Contributors” to reflect discussion in the mailing list thread. We do not view this as a change, but rather as a clarification of our shared copyright model.

* Wrap all columns to 78 or fewer characters

* Update BSD conditions to be enumerated with numbers, following the text on opensource.org and spdx.org

* In condition 3, replace “Jupyter Development Team” with the exact license text “copyright holder”.

* We previously had, in the disclaimer section, a sentence starting with “IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS…”. OWNER is now replaced with HOLDER, to reflect the license text on opensource.org and spdx.org

* Update the per-file license statement with “Project Jupyter Contributors” and “3-Clause BSD License” terminology.
  • Loading branch information
jasongrout committed Sep 9, 2019
1 parent a346386 commit a956730
Showing 1 changed file with 18 additions and 19 deletions.
37 changes: 18 additions & 19 deletions projectlicense.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
# Licensing terms

This project is licensed under the terms of the Modified BSD License
(also known as New or Revised or 3-Clause BSD), as follows:

- Copyright (c) 2001-2015, IPython Development Team
- Copyright (c) 2015-, Jupyter Development Team
This project is licensed under the terms of the 3-Clause BSD License (also
known as New or Revised or Modified BSD License, or the BSD-3-Clause license),
as follows:

Copyright (c) YEAR Project Jupyter Contributors.
All rights reserved.

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

Neither the name of the Jupyter Development Team nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
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 OWNER OR CONTRIBUTORS BE LIABLE
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
Expand Down Expand Up @@ -57,5 +56,5 @@ change to one of the Jupyter repositories.
With this in mind, the following banner should be used in any source code file
to indicate the copyright and license terms:

# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
# Copyright (c) Project Jupyter Contributors.
# Distributed under the terms of the 3-Clause BSD License.

0 comments on commit a956730

Please sign in to comment.