Skip to content

Commit ce8e7fc

Browse files
authored
Clean up license (#1218)
* move "About the Jupyter Development Team" to README.md * remove LICENSE * add license
1 parent 83f03e3 commit ce8e7fc

File tree

2 files changed

+29
-32
lines changed

2 files changed

+29
-32
lines changed

LICENSE

+1-32
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
BSD 3-Clause License
22

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-
63
- Copyright (c) 2001-2015, IPython Development Team
74
- Copyright (c) 2015-, Jupyter Development Team
85

@@ -18,7 +15,7 @@ modification, are permitted provided that the following conditions are met:
1815
this list of conditions and the following disclaimer in the documentation
1916
and/or other materials provided with the distribution.
2017

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

@@ -32,31 +29,3 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
3229
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
3330
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3431
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35-
36-
## About the Jupyter Development Team
37-
38-
The Jupyter Development Team is the set of all contributors to the Jupyter project.
39-
This includes all of the Jupyter subprojects.
40-
41-
The core team that coordinates development on GitHub can be found here:
42-
https://github.com/jupyter/.
43-
44-
## Our Copyright Policy
45-
46-
Jupyter uses a shared copyright model. Each contributor maintains copyright
47-
over their contributions to Jupyter. But, it is important to note that these
48-
contributions are typically only changes to the repositories. Thus, the Jupyter
49-
source code, in its entirety is not the copyright of any single person or
50-
institution. Instead, it is the collective copyright of the entire Jupyter
51-
Development Team. If individual contributors want to maintain a record of what
52-
changes/contributions they have specific copyright on, they should indicate
53-
their copyright in the commit message of the change, when they commit the
54-
change to one of the Jupyter repositories.
55-
56-
With this in mind, the following banner should be used in any source code file
57-
to indicate the copyright and license terms:
58-
59-
```
60-
# Copyright (c) Jupyter Development Team.
61-
# Distributed under the terms of the Modified BSD License.
62-
```

README.md

+28
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,31 @@ If you are interested in contributing to the project, see [`CONTRIBUTING.rst`](C
5252
- What: [Meeting notes](https://github.com/jupyter-server/team-compass/issues/4)
5353

5454
See our tentative [roadmap here](https://github.com/jupyter/jupyter_server/issues/127).
55+
56+
## About the Jupyter Development Team
57+
58+
The Jupyter Development Team is the set of all contributors to the Jupyter project.
59+
This includes all of the Jupyter subprojects.
60+
61+
The core team that coordinates development on GitHub can be found here:
62+
https://github.com/jupyter/.
63+
64+
## Our Copyright Policy
65+
66+
Jupyter uses a shared copyright model. Each contributor maintains copyright
67+
over their contributions to Jupyter. But, it is important to note that these
68+
contributions are typically only changes to the repositories. Thus, the Jupyter
69+
source code, in its entirety is not the copyright of any single person or
70+
institution. Instead, it is the collective copyright of the entire Jupyter
71+
Development Team. If individual contributors want to maintain a record of what
72+
changes/contributions they have specific copyright on, they should indicate
73+
their copyright in the commit message of the change, when they commit the
74+
change to one of the Jupyter repositories.
75+
76+
With this in mind, the following banner should be used in any source code file
77+
to indicate the copyright and license terms:
78+
79+
```
80+
# Copyright (c) Jupyter Development Team.
81+
# Distributed under the terms of the Modified BSD License.
82+
```

0 commit comments

Comments
 (0)