From c2a80bf3ad863941ac889a5048cab0f20508ea47 Mon Sep 17 00:00:00 2001 From: Todd Jennings Date: Tue, 10 Dec 2019 22:29:41 -0500 Subject: [PATCH 1/5] [WIP] Use BSD0 license for code in docs --- Doc/license.rst | 33 +++++++++++++++++++++++++++++++++ LICENSE | 26 ++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/Doc/license.rst b/Doc/license.rst index 810d2e63fd48c4..82a1f35ab82e03 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -72,6 +72,18 @@ make these releases possible. Terms and conditions for accessing or otherwise using Python ============================================================ +Python software and documentation are licensed under the +:ref:`PSF License Agreement `. +Starting with Python X.X.X, examples, recipes, and other code in +the documentation are dual licensed under the PSF License Agreement +and the :ref:`Zero-Clause BSD license `. + +Some software incorporated into Python is under different licenses. +The licenses are listed with code falling under that license. +See :ref:`OtherLicenses` for an incomplete list of these licenses. + + +.. _PSF-license: PSF LICENSE AGREEMENT FOR PYTHON |release| ------------------------------------------ @@ -258,6 +270,27 @@ CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 SOFTWARE. +.. _BSD0: + +ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON |release| DOCUMENTATION +---------------------------------------------------------------------- + +.. parsed-literal:: + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + + +.. _OtherLicenses: + Licenses and Acknowledgements for Incorporated Software ======================================================= diff --git a/LICENSE b/LICENSE index 9dc010d80348fc..231ef921dcd6c6 100644 --- a/LICENSE +++ b/LICENSE @@ -59,6 +59,16 @@ direction to make these releases possible. B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON =============================================================== +Python software and documentation are licensed under the +Python Software Foundation License Version 2. +Starting with Python X.X.X, examples, recipes, and other code in +the documentation are dual licensed under the PSF License Version 2 +and the Zero-Clause BSD license. + +Some software incorporated into Python is under different licenses. +The licenses are listed with code falling under that license. + + PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -------------------------------------------- @@ -252,3 +262,19 @@ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON |release| DOCUMENTATION +---------------------------------------------------------------------- + +.. parsed-literal:: + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. From f7a1a42b00b663308893e80a44bce170789b4d6b Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 03:53:40 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../next/Documentation/2020-03-07-03-53-39.bpo-39883.1tnb4-.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Documentation/2020-03-07-03-53-39.bpo-39883.1tnb4-.rst diff --git a/Misc/NEWS.d/next/Documentation/2020-03-07-03-53-39.bpo-39883.1tnb4-.rst b/Misc/NEWS.d/next/Documentation/2020-03-07-03-53-39.bpo-39883.1tnb4-.rst new file mode 100644 index 00000000000000..4941d50a560e2e --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-03-07-03-53-39.bpo-39883.1tnb4-.rst @@ -0,0 +1 @@ +Make code, examples, and recipes in the Python documentation be licensed under the more permissive BSD0 license in addition to the existing Python 2.0 license. \ No newline at end of file From 334476fa29cd91b92267f2404a5d082ae90ecace Mon Sep 17 00:00:00 2001 From: Todd Jennings Date: Tue, 1 Sep 2020 23:06:40 -0400 Subject: [PATCH 3/5] Set version number for BSD0 license to 3.8.6 --- Doc/license.rst | 2 +- LICENSE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/license.rst b/Doc/license.rst index 82a1f35ab82e03..18a8d1a1f4c6bf 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -74,7 +74,7 @@ Terms and conditions for accessing or otherwise using Python Python software and documentation are licensed under the :ref:`PSF License Agreement `. -Starting with Python X.X.X, examples, recipes, and other code in +Starting with Python 3.8.6, examples, recipes, and other code in the documentation are dual licensed under the PSF License Agreement and the :ref:`Zero-Clause BSD license `. diff --git a/LICENSE b/LICENSE index 231ef921dcd6c6..0555b971e5322b 100644 --- a/LICENSE +++ b/LICENSE @@ -61,7 +61,7 @@ B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON Python software and documentation are licensed under the Python Software Foundation License Version 2. -Starting with Python X.X.X, examples, recipes, and other code in +Starting with Python 3.8.6, examples, recipes, and other code in the documentation are dual licensed under the PSF License Version 2 and the Zero-Clause BSD license. From bc59859fa7a910a0159231b1a0dd4c72cccb66f4 Mon Sep 17 00:00:00 2001 From: Todd Jennings Date: Wed, 2 Sep 2020 23:57:34 -0400 Subject: [PATCH 4/5] Requested formatting fixes --- Doc/license.rst | 1 + LICENSE | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Doc/license.rst b/Doc/license.rst index 18a8d1a1f4c6bf..6869fe1a7115ec 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -74,6 +74,7 @@ Terms and conditions for accessing or otherwise using Python Python software and documentation are licensed under the :ref:`PSF License Agreement `. + Starting with Python 3.8.6, examples, recipes, and other code in the documentation are dual licensed under the PSF License Agreement and the :ref:`Zero-Clause BSD license `. diff --git a/LICENSE b/LICENSE index 0555b971e5322b..2dd4430e65c026 100644 --- a/LICENSE +++ b/LICENSE @@ -263,11 +263,9 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON |release| DOCUMENTATION +ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION ---------------------------------------------------------------------- -.. parsed-literal:: - Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. From 4c5b396746c0b55249719f10e8db3e1a40606655 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 2 Sep 2020 21:12:22 -0700 Subject: [PATCH 5/5] Insert a blank line --- LICENSE | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE b/LICENSE index 2dd4430e65c026..c07978a15b217b 100644 --- a/LICENSE +++ b/LICENSE @@ -61,6 +61,7 @@ B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON Python software and documentation are licensed under the Python Software Foundation License Version 2. + Starting with Python 3.8.6, examples, recipes, and other code in the documentation are dual licensed under the PSF License Version 2 and the Zero-Clause BSD license.