Skip to content

Commit ee57e90

Browse files
authored
Clean up license (#77)
1 parent afb9478 commit ee57e90

File tree

2 files changed

+43
-44
lines changed

2 files changed

+43
-44
lines changed

LICENSE

Lines changed: 15 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,30 @@
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:
1+
BSD 3-Clause License
52

63
- Copyright (c) 2021-, Jupyter Development Team
74

8-
All rights reserved.
9-
105
Redistribution and use in source and binary forms, with or without
116
modification, are permitted provided that the following conditions are met:
127

13-
Redistributions of source code must retain the above copyright notice, this
14-
list of conditions and the following disclaimer.
8+
All rights reserved.
9+
10+
1. Redistributions of source code must retain the above copyright notice, this
11+
list of conditions and the following disclaimer.
1512

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.
13+
2. Redistributions in binary form must reproduce the above copyright notice,
14+
this list of conditions and the following disclaimer in the documentation
15+
and/or other materials provided with the distribution.
1916

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.
17+
3. Neither the name of the copyright holder nor the names of its
18+
contributors may be used to endorse or promote products derived from
19+
this software without specific prior written permission.
2320

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
21+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
22+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
24+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
2825
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
2926
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
3027
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
3128
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
3229
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3330
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: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,31 @@ See [CONTRIBUTING](./CONTRIBUTING.rst#running-tests).
2424
## Contributing
2525

2626
If you are interested in contributing to the project, see [CONTRIBUTING](./CONTRIBUTING.rst).
27+
28+
## About the Jupyter Development Team
29+
30+
The Jupyter Development Team is the set of all contributors to the Jupyter project.
31+
This includes all of the Jupyter subprojects.
32+
33+
The core team that coordinates development on GitHub can be found here:
34+
https://github.com/jupyter/.
35+
36+
## Our Copyright Policy
37+
38+
Jupyter uses a shared copyright model. Each contributor maintains copyright
39+
over their contributions to Jupyter. But, it is important to note that these
40+
contributions are typically only changes to the repositories. Thus, the Jupyter
41+
source code, in its entirety is not the copyright of any single person or
42+
institution. Instead, it is the collective copyright of the entire Jupyter
43+
Development Team. If individual contributors want to maintain a record of what
44+
changes/contributions they have specific copyright on, they should indicate
45+
their copyright in the commit message of the change, when they commit the
46+
change to one of the Jupyter repositories.
47+
48+
With this in mind, the following banner should be used in any source code file
49+
to indicate the copyright and license terms:
50+
51+
```
52+
# Copyright (c) Jupyter Development Team.
53+
# Distributed under the terms of the Modified BSD License.
54+
```

0 commit comments

Comments
 (0)