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

PEP 639: Use SPDX license expressions in Core package metadata #1625

Merged
merged 42 commits into from
Sep 28, 2020

Conversation

pombredanne
Copy link
Contributor

pombredanne and others added 29 commits September 27, 2020 18:55
Signed-off-by: Philippe Ombredanne <[email protected]>
Reported-by: Aliaksei Urbanski @Jamim
Signed-off-by: Philippe Ombredanne <[email protected]>
And fix minor typo

Signed-off-by: Philippe Ombredanne <[email protected]>
CC: @pfmoore
Signed-off-by: Philippe Ombredanne <[email protected]>
Do not deprecate the License field with a new field. Instead reuse
License and provide backward compatibility.

Also add License-File field already in use in wheel and setuptools.

Integrates latest feedback

Signed-off-by: Philippe Ombredanne <[email protected]>
CC: @takluyver and @sdispater
Signed-off-by: Philippe Ombredanne <[email protected]>
Reported-by: Pradyun Gedam @pradyunsg
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>
Reported-by: Pradyun Gedam <[email protected]>
Co-Authored-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Reported-by: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>
Reported-by: Pradyun Gedam <[email protected]>
Co-Authored-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Also improve formatting

Reported-by: Pradyun Gedam @pradyunsg
Signed-off-by: Philippe Ombredanne <[email protected]>
- Refactor intro with new and improved abstract, scope, non-scope,
motivation and rationale sections
- Add new Backwards Compatibility, Security and How to Teach sections
- Move Reference Implementation out of appendix as its own section
- Add new Rejected ideas section
- Add new License Expression example using setuptools in Appendix

Reported-by: Chris Jerdonek @cjerdonek
Signed-off-by: Philippe Ombredanne <[email protected]>
Reported-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>
Reported-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>
Reported-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>
Reported-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>
Reported-by: Nick Coghlan @ncoghlan
Signed-off-by: Philippe Ombredanne <[email protected]>
Reported-by: Nick Coghlan @ncoghlan
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
The case does nt matter, but there is a canonical case: if the case
is the not the standard canonical case, tools should issue a warning.

Reported-by: Oleg Grenrus @phadej
Signed-off-by: Philippe Ombredanne <[email protected]>
Reported-by: Oleg Grenrus @phadej
Signed-off-by: Philippe Ombredanne <[email protected]>
Cabal uses both expressions and license files as proposed in this PEP

Reported-by: Oleg Grenrus @phadej
Signed-off-by: Philippe Ombredanne <[email protected]>
Reported-by: Oleg Grenrus @phadej
Signed-off-by: Philippe Ombredanne <[email protected]>
This help endsure that the expressions is fully parseable by a
conforming license expression processor

Reported-by: Oleg Grenrus @phadej
Reported-by: Nick Coghlan @ncoghlan
Signed-off-by: Philippe Ombredanne <[email protected]>
@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:

@Steap

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!

@pombredanne
Copy link
Contributor Author

@Steap ping. Your commits in this PR makes the CLA bot unhappy. We can solve this with either:

  1. you signing a CLA
  2. me squashing your commit and removing you from the commit history. You are already in Acknowledgements in all cases.

Thanks!

@pombredanne
Copy link
Contributor Author

Dear @python/pep-editors this belated PR is ready for your consideration and get a number assigned!

@Steap
Copy link

Steap commented Sep 27, 2020

  1. me squashing your commit and removing you from the commit history. You are already in Acknowledgements in all cases.

OK, let's do this :) Thanks for working on this.

pombredanne and others added 11 commits September 27, 2020 20:03
Reporte-by: Cyril Roelandt <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Reported-by: Nick Coghlan @ncoghlan
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Reported-by: Pradyun Gedam @pradyunsg
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-authored-by: Pradyun Gedam <[email protected]>
Use latest SPDX spec 2.2 and SPDX license list 3.10

Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Reported-by: Miro Hrončok @hroncok
Signed-off-by: Philippe Ombredanne <[email protected]>
pep-9999.rst Outdated
Author: Philippe Ombredanne <pombredanne at nexb.com>
Sponsor: Paul Moore <p.f.moore at gmail.com>
BDFL-Delegate: Paul Moore <p.f.moore at gmail.com>
Discussions-To: https://discuss.python.org/t/improving-license-clarity-with-better-package-metadata
Copy link
Contributor

Choose a reason for hiding this comment

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

I prefer using the ID here since the slug changes if you edit the title. This should reliably point to the same thread: https://discuss.python.org/t/2154

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@uranusjr done

Reported-by: Tzu-ping Chung @uranusjr
Signed-off-by: Philippe Ombredanne <[email protected]>
@Rosuav
Copy link
Contributor

Rosuav commented Sep 27, 2020

It looks like 639 is the next available number, so go ahead and claim that one. CLA bot is now happy, so I think that's the final barrier to merging.

Signed-off-by: Philippe Ombredanne <[email protected]>
@pombredanne pombredanne changed the title PEP 9999: Use SPDX license expressions in Core package metadata PEP 639: Use SPDX license expressions in Core package metadata Sep 28, 2020
@pombredanne
Copy link
Contributor Author

It looks like 639 is the next available number, so go ahead and claim that one. CLA bot is now happy, so I think that's the final barrier to merging.

@Rosuav done! thank you.

@Rosuav
Copy link
Contributor

Rosuav commented Sep 28, 2020

LGTM!

@Rosuav Rosuav merged commit fa61557 into python:master Sep 28, 2020
@pradyunsg
Copy link
Member

Thanks @Rosuav! ^>^

mnm678 pushed a commit to mnm678/peps that referenced this pull request Oct 22, 2020
…n#1625)

* Add PEP draft for SPDX license expressions

Signed-off-by: Philippe Ombredanne <[email protected]>

* Add reference to another license-related ticket

pypa/packaging-problems#41

Signed-off-by: Philippe Ombredanne <[email protected]>

* Add proper Draft status

Signed-off-by: Philippe Ombredanne <[email protected]>

* Direct PEP discussions to discuss.python.org

Signed-off-by: Philippe Ombredanne <[email protected]>

* Adopt latest PEP copyright conventions

Reported-by: Aliaksei Urbanski @Jamim
Signed-off-by: Philippe Ombredanne <[email protected]>

* Add @pf_moore as BDFL delegate.

And fix minor typo

Signed-off-by: Philippe Ombredanne <[email protected]>

* Add Paul Moore as a PEP sponsor

CC: @pfmoore
Signed-off-by: Philippe Ombredanne <[email protected]>

* Reuse License Field. Add License-File.

Do not deprecate the License field with a new field. Instead reuse
License and provide backward compatibility.

Also add License-File field already in use in wheel and setuptools.

Integrates latest feedback

Signed-off-by: Philippe Ombredanne <[email protected]>

* Add packaging license metadata survey sections

Signed-off-by: Philippe Ombredanne <[email protected]>

* Add poetry and flit references

CC: @takluyver and @sdispater
Signed-off-by: Philippe Ombredanne <[email protected]>

* Fix typo

Reported-by: Pradyun Gedam @pradyunsg
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>

* Fix typo and improve subtitle

Reported-by: Pradyun Gedam <[email protected]>
Co-Authored-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

* Fix typo

Reported-by: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>

* Fix typo

Reported-by: Pradyun Gedam <[email protected]>
Co-Authored-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

* Use appendix and use footnotes for links

Also improve formatting

Reported-by: Pradyun Gedam @pradyunsg
Signed-off-by: Philippe Ombredanne <[email protected]>

* Add new sections and improve existing sections

- Refactor intro with new and improved abstract, scope, non-scope,
motivation and rationale sections
- Add new Backwards Compatibility, Security and How to Teach sections
- Move Reference Implementation out of appendix as its own section
- Add new Rejected ideas section
- Add new License Expression example using setuptools in Appendix

Reported-by: Chris Jerdonek @cjerdonek
Signed-off-by: Philippe Ombredanne <[email protected]>

* Fix typo

Reported-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>

* Fix typo

Reported-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>

* Improve presentation

Reported-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>

* Improve style

Reported-By: Pradyun Gedam <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-Authored-By: Pradyun Gedam <[email protected]>

* Move setuptools and wheel notes on license-file out

Reported-by: Nick Coghlan @ncoghlan
Signed-off-by: Philippe Ombredanne <[email protected]>

* Clarify and discourage use of public domain

Reported-by: Nick Coghlan @ncoghlan
Signed-off-by: Philippe Ombredanne <[email protected]>

* Fix typo

Signed-off-by: Philippe Ombredanne <[email protected]>

* Fix typos and clarify multi classifiers migrations

Signed-off-by: Philippe Ombredanne <[email protected]>

* Report warning for expression case

The case does nt matter, but there is a canonical case: if the case
is the not the standard canonical case, tools should issue a warning.

Reported-by: Oleg Grenrus @phadej
Signed-off-by: Philippe Ombredanne <[email protected]>

* Use deprecated not obsolete per SPDX

Reported-by: Oleg Grenrus @phadej
Signed-off-by: Philippe Ombredanne <[email protected]>

* Correct Cabal that uses SPDX expressions

Cabal uses both expressions and license files as proposed in this PEP

Reported-by: Oleg Grenrus @phadej
Signed-off-by: Philippe Ombredanne <[email protected]>

* Fix typo

Reported-by: Oleg Grenrus @phadej
Signed-off-by: Philippe Ombredanne <[email protected]>

* Use LicenseRef- prefix for non-standard SPDX ids

This help endsure that the expressions is fully parseable by a
conforming license expression processor

Reported-by: Oleg Grenrus @phadej
Reported-by: Nick Coghlan @ncoghlan
Signed-off-by: Philippe Ombredanne <[email protected]>

* Fix typos.

Reporte-by: Cyril Roelandt <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>

* Fix typo and add BSD* distributions reference


Signed-off-by: Philippe Ombredanne <[email protected]>

* Fix typo and improve grammar


Reported-by: Nick Coghlan @ncoghlan
Signed-off-by: Philippe Ombredanne <[email protected]>

* Copy Edits for initial sections

* Reword a paragraph

* Update pep-9999.rst

* Fix typo


Signed-off-by: Philippe Ombredanne <[email protected]>

* Remove erroneous leading spaces

Reported-by: Pradyun Gedam @pradyunsg
Signed-off-by: Philippe Ombredanne <[email protected]>

Co-authored-by: Pradyun Gedam <[email protected]>

* Update SPDX license list and spec versions

Use latest SPDX spec 2.2 and SPDX license list 3.10

Signed-off-by: Philippe Ombredanne <[email protected]>

* Fix typos and formatting

Signed-off-by: Philippe Ombredanne <[email protected]>

* Clarify License file path definition

Reported-by: Miro Hrončok @hroncok
Signed-off-by: Philippe Ombredanne <[email protected]>

* Use permalink for discussion link

Reported-by: Tzu-ping Chung @uranusjr
Signed-off-by: Philippe Ombredanne <[email protected]>

* Assign number as PEP-0639

Signed-off-by: Philippe Ombredanne <[email protected]>

Co-authored-by: Pradyun Gedam <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants