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

bpo-39883: Use BSD0 license for code in docs #17635

Merged
merged 5 commits into from
Sep 3, 2020
Merged

Conversation

toddrjen
Copy link
Contributor

@toddrjen toddrjen commented Dec 17, 2019

NOTE Please do not accept this pull request. It needs to be discussed and approved by the PSF board. (UPDATE: The PSF board approved it. We are going ahead.)

On the Python-ideas mailing list, we discussed making the code in the documentation under a more permissive license to make it easier for people to re-use it. Specifically, the idea is to use the BSD zero clause license to remove essentially all restrictions on the use of that code.

Guido van Rossum liked the idea, so per his request I am submitting a pull request as the first stage in getting this change potentially implemented. I will then submit this pull request, and the accompanying pull request python/python-docs-theme#36, to the PSF board for discussion. It will also likely need a review by a lawyer.

This specific request adds additional information on what, specifically, the current license is, the part about code in the documentation being under the 0BSD license, the text of the 0BSD license, and a bit about other parts being under other licenses (I am particularly unsure that the last part should be in there at all).

The current format will likely change substantially, and changes to the CPython side may not end up being necessary. Guido seemed to think that simply a blurb in the online documentation footer may be sufficient. The code that generates the footer is in the python/python-docs-theme project and the change has been submitted there in pull request python/python-docs-theme#36.

Comments are appreciated.

Edit: Added information about additional pull request.

https://bugs.python.org/issue39883

@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

Recognized GitHub username

We couldn't find a bugs.python.org (b.p.o) account corresponding to the following GitHub usernames:

@toddrjen

This might be simply due to a missing "GitHub Name" entry in one's b.p.o account settings. This is necessary for legal reasons before we can look at this contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

Doc/license.rst Outdated
@@ -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 <PSF-license>`.
Starting with Python X.X.X, examples, recipes, and other code in
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I presume X.X.X will be 3.9.0. (Also in the LICENSE file.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure how long this process will take so I didn't want to commit to a particular release. if it makes it into 3.9.0 that would be great.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would think that this could be backported. If it is, they should also be listed. In any case, good idea.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can list this as per 3.9.0 even if it doesn't make it in the release (rc2 is scheduled for Sept 14).

Release manager (@ambv) do you think it's reasonable to land this doc-only change?

And I agree we could backport to 3.8.0, in which case we should just say per 3.8.6 (which would be the next release, also going out Sept 14).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gvanrossum Perfectly reasonable.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Both for this to land in 3.8.6rc1 as well as in 3.9.0rc2.)

@Mariatta
Copy link
Member

Mariatta commented Mar 6, 2020

What does PSF legal team say about this? Cc @VanL

@VanL
Copy link
Member

VanL commented Mar 6, 2020

This is fine, but our contributor agreement says that it needs to be by vote of the board. The vote will happen later this month, I don't expect it will be an issue.

Thanks,
Van

@Mariatta
Copy link
Member

Mariatta commented Mar 6, 2020

Thanks for the reply @VanL for the quick reply.

I think this is change will be worthy of a News Entry.

@gvanrossum
Copy link
Member

@toddrjen Do you know how to add a news entry? (https://discuss.python.org/t/blurb-it-is-now-available/528)

@toddrjen
Copy link
Contributor Author

toddrjen commented Mar 7, 2020

@gvanrossum I made a blurb. Please let me know if it is okay.

@gvanrossum
Copy link
Member

Yup, thanks! Now we wait for the board...

@terryjreedy terryjreedy changed the title [WIP] Use BSD0 license for code in docs [WIP] bpo-39883: Use BSD0 license for code in docs Mar 16, 2020
@toddrjen
Copy link
Contributor Author

Just following up on this. Did the board have a vote? I don't see one mentioned in the minutes.

@gvanrossum
Copy link
Member

I’ve pinged Ewa.

@gvanrossum
Copy link
Member

Unfortunately it fell through the cracks due to the start of the pandemic. Ewa will bring it up for a vote again.

@ejodlowska
Copy link

Hi folks - the following resolution was approved by the PSF Board on August 26, 2020: RESOLVED: The license for code included within the Python documentation is changed to Zero-Clause BSD / Free Public License 1.0.0 (0BSD), effective as of the date of this resolution.

@gvanrossum
Copy link
Member

gvanrossum commented Aug 31, 2020 via email

Copy link
Member

@gvanrossum gvanrossum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I forgot that this is the PR. I will approve once you put the version numbers in. I think 3.8.6 is reasonable.

Doc/license.rst Outdated
@@ -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 <PSF-license>`.
Starting with Python X.X.X, examples, recipes, and other code in
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can list this as per 3.9.0 even if it doesn't make it in the release (rc2 is scheduled for Sept 14).

Release manager (@ambv) do you think it's reasonable to land this doc-only change?

And I agree we could backport to 3.8.0, in which case we should just say per 3.8.6 (which would be the next release, also going out Sept 14).

LICENSE Outdated Show resolved Hide resolved
@gvanrossum gvanrossum changed the title [WIP] bpo-39883: Use BSD0 license for code in docs bpo-39883: Use BSD0 license for code in docs Aug 31, 2020
@gvanrossum gvanrossum added needs backport to 3.8 only security fixes needs backport to 3.9 only security fixes and removed DO-NOT-MERGE labels Aug 31, 2020
@toddrjen
Copy link
Contributor Author

toddrjen commented Sep 2, 2020

@gvanrossum I set the two version numbers to 3.8.6 as requested.

Copy link
Member

@gvanrossum gvanrossum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Almost there; I found some markup on LICENSE.

LICENSE Outdated Show resolved Hide resolved
LICENSE Outdated Show resolved Hide resolved
Doc/license.rst Show resolved Hide resolved
@gvanrossum gvanrossum merged commit e223d06 into python:master Sep 3, 2020
@miss-islington
Copy link
Contributor

Thanks @toddrjen for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8, 3.9.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 3, 2020
The PSF board approved this use.
(cherry picked from commit e223d06)

Co-authored-by: Todd <[email protected]>
@bedevere-bot
Copy link

GH-22073 is a backport of this pull request to the 3.9 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Sep 3, 2020
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 3, 2020
The PSF board approved this use.
(cherry picked from commit e223d06)

Co-authored-by: Todd <[email protected]>
@bedevere-bot
Copy link

GH-22074 is a backport of this pull request to the 3.8 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.8 only security fixes label Sep 3, 2020
gvanrossum pushed a commit that referenced this pull request Sep 3, 2020
The PSF board approved this use.
(cherry picked from commit e223d06)

Co-authored-by: Todd <[email protected]>
gvanrossum pushed a commit that referenced this pull request Sep 3, 2020
The PSF board approved this use.
(cherry picked from commit e223d06)

Co-authored-by: Todd <[email protected]>
shihai1991 added a commit to shihai1991/cpython that referenced this pull request Sep 5, 2020
…lots1

* origin/master: (63 commits)
  bpo-41627: Distinguish 32 and 64-bit user site packages on Windows (pythonGH-22098)
  bpo-38585: Remove references to defusedexpat (pythonGH-22095)
  bpo-41721: Add xlc options (pythonGH-22096)
  bpo-40486: Specify what happens if directory content change diring iteration (pythonGH-22025)
  bpo-41638: Improve ProgrammingError message for absent parameter. (pythonGH-21999)
  bpo-41713: _signal doesn't use multi-phase init (pythonGH-22087)
  bpo-41700: Skip test if the locale is not supported (pythonGH-22081)
  [doc] Update documentation on logging optimization. (pythonGH-22075)
  Fix 'gather' rules in the python parser generator (pythonGH-22021)
  bpo-41697: Correctly handle KeywordOrStarred when parsing arguments in the parser (pythonGH-22077)
  [doc] Fix a typo in the graphlib docs (python#22030)
  bpo-1635741: Port _signal module to multi-phase init (PEP 489) (pythonGH-22049)
  bpo-39883: Use BSD0 license for code in docs (pythonGH-17635)
  bpo-39010: Improve test shutdown (python#22066)
  bpo-41696: Fix handling of debug mode in asyncio.run (python#22069)
  bpo-41690: Use a loop to collect args in the parser instead of recursion (pythonGH-22053)
  closes bpo-41689: Preserve text signature from tp_doc in C heap type creation. (pythonGH-22058)
  Fix invalid escape sequences in the peg_highlight Sphinx extension (pythonGH-22047)
  bpo-41675: Modernize siginterrupt calls (pythonGH-22028)
  bpo-41685: Don't pin setuptools version anymore in Doc/Makefile (pythonGH-22062)
  ...
xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020
@toddrjen toddrjen mannequin mentioned this pull request Oct 6, 2023
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.