Skip to content

Commit 60896b3

Browse files
committed
update license to Jupyter's BSD-3 license
1 parent 6a6427a commit 60896b3

File tree

2 files changed

+45
-14
lines changed

2 files changed

+45
-14
lines changed

LICENSE

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,59 @@
1-
BSD 3-Clause License
1+
# Licensing terms
2+
3+
This project is licensed under the terms of the Modified BSD License
4+
(also known as New or Revised or 3-Clause BSD), as follows:
5+
6+
- Copyright (c) 2020-, Jupyter Development Team
27

3-
Copyright (c) 2020, jupyter-server
48
All rights reserved.
59

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

9-
1. Redistributions of source code must retain the above copyright notice, this
10-
list of conditions and the following disclaimer.
13+
Redistributions of source code must retain the above copyright notice, this
14+
list of conditions and the following disclaimer.
1115

12-
2. Redistributions in binary form must reproduce the above copyright notice,
13-
this list of conditions and the following disclaimer in the documentation
14-
and/or other materials provided with the distribution.
16+
Redistributions in binary form must reproduce the above copyright notice, this
17+
list of conditions and the following disclaimer in the documentation and/or
18+
other materials provided with the distribution.
1519

16-
3. Neither the name of the copyright holder nor the names of its
17-
contributors may be used to endorse or promote products derived from
18-
this software without specific prior written permission.
20+
Neither the name of the Jupyter Development Team nor the names of its
21+
contributors may be used to endorse or promote products derived from this
22+
software without specific prior written permission.
1923

20-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
25+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
26+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
27+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
2428
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
2529
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
2630
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
2731
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
2832
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2933
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34+
35+
## About the Jupyter Development Team
36+
37+
The Jupyter Development Team is the set of all contributors to the Jupyter project.
38+
This includes all of the Jupyter subprojects.
39+
40+
The core team that coordinates development on GitHub can be found here:
41+
https://github.com/jupyter/.
42+
43+
## Our Copyright Policy
44+
45+
Jupyter uses a shared copyright model. Each contributor maintains copyright
46+
over their contributions to Jupyter. But, it is important to note that these
47+
contributions are typically only changes to the repositories. Thus, the Jupyter
48+
source code, in its entirety is not the copyright of any single person or
49+
institution. Instead, it is the collective copyright of the entire Jupyter
50+
Development Team. If individual contributors want to maintain a record of what
51+
changes/contributions they have specific copyright on, they should indicate
52+
their copyright in the commit message of the change, when they commit the
53+
change to one of the Jupyter repositories.
54+
55+
With this in mind, the following banner should be used in any source code file
56+
to indicate the copyright and license terms:
57+
58+
# Copyright (c) Jupyter Development Team.
59+
# Distributed under the terms of the Modified BSD License.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# pytest-jupyter
2+
23
A pytest plugin for testing Jupyter core libraries and extensions.

0 commit comments

Comments
 (0)