From 90892fd0e9c0999af1c44a094b436454827065fd Mon Sep 17 00:00:00 2001 From: dcsaba89 <54766615+dcsaba89@users.noreply.github.com> Date: Thu, 16 Feb 2023 18:47:09 +0100 Subject: [PATCH 1/4] add license --- LICENSE | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..b5be8fe9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,30 @@ +BSD 3-Clause License + +Copyright (c) 2015, IPython Development Team + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +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. + +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 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. From 381cf2dacdfa4121d6f5f6f399db4d3ef464e3eb Mon Sep 17 00:00:00 2001 From: Csaba Drahos Date: Thu, 16 Feb 2023 18:55:05 +0100 Subject: [PATCH 2/4] replace references for COPYING.md to LICENSE --- ipykernel/gui/__init__.py | 2 +- ipykernel/gui/gtk3embed.py | 2 +- ipykernel/gui/gtkembed.py | 2 +- ipykernel/heartbeat.py | 2 +- ipykernel/inprocess/blocking.py | 2 +- ipykernel/inprocess/client.py | 2 +- pyproject.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ipykernel/gui/__init__.py b/ipykernel/gui/__init__.py index bbf3b9ff..10d31f93 100644 --- a/ipykernel/gui/__init__.py +++ b/ipykernel/gui/__init__.py @@ -10,6 +10,6 @@ # # Distributed under the terms of the BSD License. # -# The full license is in the file COPYING.txt, distributed as part of this +# The full license is in the file LICENSE, distributed as part of this # software. # ----------------------------------------------------------------------------- diff --git a/ipykernel/gui/gtk3embed.py b/ipykernel/gui/gtk3embed.py index 3847683c..4a85fefa 100644 --- a/ipykernel/gui/gtk3embed.py +++ b/ipykernel/gui/gtk3embed.py @@ -4,7 +4,7 @@ # Copyright (C) 2010-2011 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in -# the file COPYING.txt, distributed as part of this software. +# the file LICENSE, distributed as part of this software. # ----------------------------------------------------------------------------- # ----------------------------------------------------------------------------- diff --git a/ipykernel/gui/gtkembed.py b/ipykernel/gui/gtkembed.py index 5d9171bb..2adcbd81 100644 --- a/ipykernel/gui/gtkembed.py +++ b/ipykernel/gui/gtkembed.py @@ -4,7 +4,7 @@ # Copyright (C) 2010-2011 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in -# the file COPYING.txt, distributed as part of this software. +# the file LICENSE, distributed as part of this software. # ----------------------------------------------------------------------------- # ----------------------------------------------------------------------------- diff --git a/ipykernel/heartbeat.py b/ipykernel/heartbeat.py index cf2d6d5a..33beaad6 100644 --- a/ipykernel/heartbeat.py +++ b/ipykernel/heartbeat.py @@ -5,7 +5,7 @@ # Copyright (C) 2008-2011 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in -# the file COPYING, distributed as part of this software. +# the file LICENSE, distributed as part of this software. # ----------------------------------------------------------------------------- # ----------------------------------------------------------------------------- diff --git a/ipykernel/inprocess/blocking.py b/ipykernel/inprocess/blocking.py index 2274bed3..f09bb231 100644 --- a/ipykernel/inprocess/blocking.py +++ b/ipykernel/inprocess/blocking.py @@ -8,7 +8,7 @@ # Copyright (C) 2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in -# the file COPYING.txt, distributed as part of this software. +# the file LICENSE, distributed as part of this software. # ----------------------------------------------------------------------------- from queue import Empty, Queue diff --git a/ipykernel/inprocess/client.py b/ipykernel/inprocess/client.py index aaf2db8f..ea964ecd 100644 --- a/ipykernel/inprocess/client.py +++ b/ipykernel/inprocess/client.py @@ -4,7 +4,7 @@ # Copyright (C) 2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in -# the file COPYING, distributed as part of this software. +# the file LICENSE, distributed as part of this software. # ----------------------------------------------------------------------------- # ----------------------------------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index 0b3807ac..7476444f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" name = "ipykernel" dynamic = ["version"] authors = [{name = "IPython Development Team", email = "ipython-dev@scipy.org"}] -license = {file = "COPYING.md"} +license = {file = "LICENSE"} readme = "README.md" description = "IPython Kernel for Jupyter" keywords = ["Interactive", "Interpreter", "Shell", "Web"] From e92a87d383db1cddbbda087ebfc0115e2fb0cddd Mon Sep 17 00:00:00 2001 From: Csaba Drahos Date: Thu, 16 Feb 2023 18:55:55 +0100 Subject: [PATCH 3/4] move "About the IPython Development Team" section to README.md --- README.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/README.md b/README.md index 0dbf03b3..f758714a 100644 --- a/README.md +++ b/README.md @@ -33,3 +33,31 @@ and then from the root directory ```bash pytest ipykernel -vv -s --cov ipykernel --cov-branch --cov-report term-missing:skip-covered --durations 10 ``` + +## About the IPython Development Team + +The IPython Development Team is the set of all contributors to the IPython project. +This includes all of the IPython subprojects. + +The core team that coordinates development on GitHub can be found here: +https://github.com/ipython/. + +## Our Copyright Policy + +IPython uses a shared copyright model. Each contributor maintains copyright +over their contributions to IPython. But, it is important to note that these +contributions are typically only changes to the repositories. Thus, the IPython +source code, in its entirety is not the copyright of any single person or +institution. Instead, it is the collective copyright of the entire IPython +Development Team. If individual contributors want to maintain a record of what +changes/contributions they have specific copyright on, they should indicate +their copyright in the commit message of the change, when they commit the +change to one of the IPython 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) IPython Development Team. +# Distributed under the terms of the Modified BSD License. +``` From 2a93492e8d205157f83fb96d588d2b7b794acb7d Mon Sep 17 00:00:00 2001 From: Csaba Drahos Date: Thu, 16 Feb 2023 18:56:16 +0100 Subject: [PATCH 4/4] remove COPYING.md --- COPYING.md | 61 ------------------------------------------------------ 1 file changed, 61 deletions(-) delete mode 100644 COPYING.md diff --git a/COPYING.md b/COPYING.md deleted file mode 100644 index d7447c93..00000000 --- a/COPYING.md +++ /dev/null @@ -1,61 +0,0 @@ -# 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) 2015, IPython Development Team - -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. - -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 IPython 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. - -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 -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. - -## About the IPython Development Team - -The IPython Development Team is the set of all contributors to the IPython project. -This includes all of the IPython subprojects. - -The core team that coordinates development on GitHub can be found here: -https://github.com/ipython/. - -## Our Copyright Policy - -IPython uses a shared copyright model. Each contributor maintains copyright -over their contributions to IPython. But, it is important to note that these -contributions are typically only changes to the repositories. Thus, the IPython -source code, in its entirety is not the copyright of any single person or -institution. Instead, it is the collective copyright of the entire IPython -Development Team. If individual contributors want to maintain a record of what -changes/contributions they have specific copyright on, they should indicate -their copyright in the commit message of the change, when they commit the -change to one of the IPython 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) IPython Development Team. -# Distributed under the terms of the Modified BSD License. -```