Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update LICENSE file #63

Merged
merged 2 commits into from
Aug 4, 2022
Merged

Update LICENSE file #63

merged 2 commits into from
Aug 4, 2022

Conversation

srittau
Copy link
Collaborator

@srittau srittau commented Aug 2, 2022

This integrates some changes from the CPython repository:

  • Update the copyright years.
  • Update some wording in the history introduction.
  • Change capitalization of the word "internet".

This integrates some changes from the CPython repository:

* Update the copyright years.
* Update some wording in the history introduction.
* Change capitalization of the word "internet".
AlexWaygood added a commit to AlexWaygood/typing_extensions that referenced this pull request Aug 2, 2022
Hopefully this fixes the CI failure seen in python#63
@srittau srittau requested a review from gvanrossum August 3, 2022 09:02
@gvanrossum
Copy link
Member

Are there remaining differences with the cpython license left?

@gvanrossum
Copy link
Member

And whatever we do here should be done to typing too, right?

@srittau
Copy link
Collaborator Author

srittau commented Aug 3, 2022

I'll send a PR for typing as well. Here's a diff for remaining changes

--- LICENSE	2022-08-03 16:40:41.998187611 +0200
+++ ../cpython/LICENSE	2022-05-03 13:41:18.466707570 +0200
@@ -59,6 +59,17 @@
 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.
+
+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 +263,17 @@
 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 DOCUMENTATION
+----------------------------------------------------------------------
+
+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.

The zero-clause license makes no sense for this repo, but would make sense for the typing repo. But this is probably something we should discuss over there. We could add the first sentence here, though:

Python software and documentation are licensed under the
Python Software Foundation License Version 2.

@gvanrossum
Copy link
Member

That makes sense but probably won’t satisfy that tool. An alternative might be the PSF-2.0 license from that tool’s repo but we’d have to all agree on it and review it.

@JelleZijlstra
Copy link
Member

To satisfy the tools, it's probably best to match CPython's LICENSE file exactly, isn't it?

@gvanrossum
Copy link
Member

Dunno, it looked like CPython was also categorized as OTHER…

@srittau
Copy link
Collaborator Author

srittau commented Aug 4, 2022

Honestly, I don't think we should add "useless" parts to the license file just to satisfy some license checking tools. This just makes it harder to understand for human consumption and has the chance to make it legally muddier.

@srittau srittau merged commit fb77519 into python:main Aug 4, 2022
@srittau srittau deleted the update-license branch August 4, 2022 10:14
kraj pushed a commit to YoeDistro/poky that referenced this pull request Nov 4, 2022
* Add SUMMARY, DESCRIPTION, BUGTRACKER and SECTION
* Update HOMEPAGE to agree with PyPi

https://github.com/python/typing_extensions/blob/main/CHANGELOG.md#release-440-october-6-2022

Release 4.4.0 (October 6, 2022)

* Add typing_extensions.Any a backport of python 3.11's Any class
  which is subclassable at runtime. (backport from python/cpython#31841,
  by Shantanu and Jelle Zijlstra). Patch by James Hilton-Balfe
  (@Gobot1234).
* Add initial support for TypeVarLike default parameter, PEP 696.
  Patch by Marc Mueller (@cdce8p).
* Runtime support for PEP 698, adding typing_extensions.override.
  Patch by Jelle Zijlstra.
* Add the infer_variance parameter to TypeVar, as specified in PEP
  695. Patch by Jelle Zijlstra.

License-Update: update copyright years; align with CPython LICENSE

See python/typing_extensions#63

(From OE-Core rev: 6dc6c11b638c1d45f4dc9c7813f93a09229c33b3)

Signed-off-by: Tim Orling <[email protected]>
Signed-off-by: Alexandre Belloni <[email protected]>
kraj pushed a commit to YoeDistro/poky that referenced this pull request Nov 4, 2022
* Add SUMMARY, DESCRIPTION, BUGTRACKER and SECTION
* Update HOMEPAGE to agree with PyPi

https://github.com/python/typing_extensions/blob/main/CHANGELOG.md#release-440-october-6-2022

Release 4.4.0 (October 6, 2022)

* Add typing_extensions.Any a backport of python 3.11's Any class
  which is subclassable at runtime. (backport from python/cpython#31841,
  by Shantanu and Jelle Zijlstra). Patch by James Hilton-Balfe
  (@Gobot1234).
* Add initial support for TypeVarLike default parameter, PEP 696.
  Patch by Marc Mueller (@cdce8p).
* Runtime support for PEP 698, adding typing_extensions.override.
  Patch by Jelle Zijlstra.
* Add the infer_variance parameter to TypeVar, as specified in PEP
  695. Patch by Jelle Zijlstra.

License-Update: update copyright years; align with CPython LICENSE

See python/typing_extensions#63

(From OE-Core rev: 0cb15457edaa6cee3ac152a18d8b6ba4204dd958)

Signed-off-by: Tim Orling <[email protected]>
Signed-off-by: Alexandre Belloni <[email protected]>
kraj pushed a commit to YoeDistro/poky that referenced this pull request Nov 7, 2022
* Add SUMMARY, DESCRIPTION, BUGTRACKER and SECTION
* Update HOMEPAGE to agree with PyPi

https://github.com/python/typing_extensions/blob/main/CHANGELOG.md#release-440-october-6-2022

Release 4.4.0 (October 6, 2022)

* Add typing_extensions.Any a backport of python 3.11's Any class
  which is subclassable at runtime. (backport from python/cpython#31841,
  by Shantanu and Jelle Zijlstra). Patch by James Hilton-Balfe
  (@Gobot1234).
* Add initial support for TypeVarLike default parameter, PEP 696.
  Patch by Marc Mueller (@cdce8p).
* Runtime support for PEP 698, adding typing_extensions.override.
  Patch by Jelle Zijlstra.
* Add the infer_variance parameter to TypeVar, as specified in PEP
  695. Patch by Jelle Zijlstra.

License-Update: update copyright years; align with CPython LICENSE

See python/typing_extensions#63

(From OE-Core rev: 0cb15457edaa6cee3ac152a18d8b6ba4204dd958)

Signed-off-by: Tim Orling <[email protected]>
Signed-off-by: Alexandre Belloni <[email protected]>
rpurdie pushed a commit to yoctoproject/poky that referenced this pull request Nov 7, 2022
* Add SUMMARY, DESCRIPTION, BUGTRACKER and SECTION
* Update HOMEPAGE to agree with PyPi

https://github.com/python/typing_extensions/blob/main/CHANGELOG.md#release-440-october-6-2022

Release 4.4.0 (October 6, 2022)

* Add typing_extensions.Any a backport of python 3.11's Any class
  which is subclassable at runtime. (backport from python/cpython#31841,
  by Shantanu and Jelle Zijlstra). Patch by James Hilton-Balfe
  (@Gobot1234).
* Add initial support for TypeVarLike default parameter, PEP 696.
  Patch by Marc Mueller (@cdce8p).
* Runtime support for PEP 698, adding typing_extensions.override.
  Patch by Jelle Zijlstra.
* Add the infer_variance parameter to TypeVar, as specified in PEP
  695. Patch by Jelle Zijlstra.

License-Update: update copyright years; align with CPython LICENSE

See python/typing_extensions#63

(From OE-Core rev: 15ca091ae01ae298c013e8cf82ee6af382259ed8)

Signed-off-by: Tim Orling <[email protected]>
Signed-off-by: Alexandre Belloni <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>
halstead pushed a commit to openembedded/openembedded-core that referenced this pull request Nov 7, 2022
* Add SUMMARY, DESCRIPTION, BUGTRACKER and SECTION
* Update HOMEPAGE to agree with PyPi

https://github.com/python/typing_extensions/blob/main/CHANGELOG.md#release-440-october-6-2022

Release 4.4.0 (October 6, 2022)

* Add typing_extensions.Any a backport of python 3.11's Any class
  which is subclassable at runtime. (backport from python/cpython#31841,
  by Shantanu and Jelle Zijlstra). Patch by James Hilton-Balfe
  (@Gobot1234).
* Add initial support for TypeVarLike default parameter, PEP 696.
  Patch by Marc Mueller (@cdce8p).
* Runtime support for PEP 698, adding typing_extensions.override.
  Patch by Jelle Zijlstra.
* Add the infer_variance parameter to TypeVar, as specified in PEP
  695. Patch by Jelle Zijlstra.

License-Update: update copyright years; align with CPython LICENSE

See python/typing_extensions#63

Signed-off-by: Tim Orling <[email protected]>
Signed-off-by: Alexandre Belloni <[email protected]>
daregit pushed a commit to daregit/yocto-combined that referenced this pull request May 22, 2024
* Add SUMMARY, DESCRIPTION, BUGTRACKER and SECTION
* Update HOMEPAGE to agree with PyPi

https://github.com/python/typing_extensions/blob/main/CHANGELOG.md#release-440-october-6-2022

Release 4.4.0 (October 6, 2022)

* Add typing_extensions.Any a backport of python 3.11's Any class
  which is subclassable at runtime. (backport from python/cpython#31841,
  by Shantanu and Jelle Zijlstra). Patch by James Hilton-Balfe
  (@Gobot1234).
* Add initial support for TypeVarLike default parameter, PEP 696.
  Patch by Marc Mueller (@cdce8p).
* Runtime support for PEP 698, adding typing_extensions.override.
  Patch by Jelle Zijlstra.
* Add the infer_variance parameter to TypeVar, as specified in PEP
  695. Patch by Jelle Zijlstra.

License-Update: update copyright years; align with CPython LICENSE

See python/typing_extensions#63

(From OE-Core rev: 15ca091ae01ae298c013e8cf82ee6af382259ed8)

Signed-off-by: Tim Orling <[email protected]>
Signed-off-by: Alexandre Belloni <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants