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

New license: Python-2.0.1 #1549

Merged
merged 12 commits into from
Aug 11, 2022
Merged

New license: Python-2.0.1 #1549

merged 12 commits into from
Aug 11, 2022

Conversation

jlovejoy
Copy link
Member

@jlovejoy jlovejoy commented Aug 2, 2022

see lengthy discussion at #1200

But it seems that this "version" appears in a number of places and thus would be helpful to add.
Most notably:

Signed-off-by: Jilayne Lovejoy

@jlovejoy
Copy link
Member Author

jlovejoy commented Aug 2, 2022

@swinslow or @zvr - I tried to do markup throughout to accommodate where sometimes it says: "Python 2.0.1" or "Python 3.10.6" or "Python" (no version number)

I don't think I did it right... maybe I should have had the word Python in there as well, not just the version number?

It'd be nice to also proof this against other version numbers...

@jlovejoy
Copy link
Member Author

jlovejoy commented Aug 2, 2022

btw - I could go either way on short id of:
Python-2.0.1 (which is what I put)
or
PSF-2.0.1 which @brettcannon suggested

The reason I leaned towards Python-2.0 was to be "consistent" with the use of that prior for a license stack, versus PSF-2.0 which was for just the first license of the stack.

FYI @ockham
@capfei
@ariel11

As for 0BSD - I did not included that, as I take @VanL comment (through @brettcannon) to mean that one can choose 0BSD or Python/PSF

Would really like to get this merged asap and be done with it (for now or until some other historical version surfaces...) :)

@richardfontana
Copy link
Contributor

PSF-2.0.1 seems confusing - I already have the notion in my mind that "the PSF license Is the top of the Python License stack".

@capfei
Copy link
Collaborator

capfei commented Aug 3, 2022

Agree with @richardfontana; PSF = top, Python = full.

Thank you @jlovejoy!!!! 😂

@gotmax23
Copy link

gotmax23 commented Aug 3, 2022

and otherwise use Python <alt match="2.0.1|3.10.6| " name="version">2.0.1</alt> alone or in any derivative

This is not correct. It should match any Python version.

The same comment applies to the use of this match in the rest of the template.

@jlovejoy
Copy link
Member Author

jlovejoy commented Aug 5, 2022

@gotmax23 - yeah.... I only found those two examples of version numbers and in other cases there simply isn't a version number at all (Please, PSF, do it this way from now on!) I need a bit of help on the markup to express, it can be a version or no version number... once I sort that out, then this should be ready to go.

Copy link
Member

@swinslow swinslow left a comment

Choose a reason for hiding this comment

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

Take a look at my comments inline -- see if these help resolve the issues?

src/Python-2.0.1.xml Outdated Show resolved Hide resolved
src/Python-2.0.1.xml Outdated Show resolved Hide resolved
src/Python-2.0.1.xml Outdated Show resolved Hide resolved
src/Python-2.0.1.xml Outdated Show resolved Hide resolved
src/Python-2.0.1.xml Outdated Show resolved Hide resolved
src/Python-2.0.1.xml Outdated Show resolved Hide resolved
src/Python-2.0.1.xml Outdated Show resolved Hide resolved
Signed-off-by: Steve Winslow <steve@swinslow.net>
Signed-off-by: Steve Winslow <steve@swinslow.net>
@swinslow
Copy link
Member

swinslow commented Aug 5, 2022

OK -- I'm hopeful on this one...

@swinslow
Copy link
Member

swinslow commented Aug 5, 2022

@jlovejoy Solved the quote marks issue, but some other bits are failing. I'll clean it up before merging prior to releasing 3.18.

Signed-off-by: Steve Winslow <steve@swinslow.net>
@swinslow
Copy link
Member

swinslow commented Aug 5, 2022

So, even though under the matching guidelines the titleText should be disregarded, the license-list-XML validator requires it to be the same as the test text file. Including the row-of-dashes lines, as separate <p> paragraphs. :)

@brettcannon
Copy link

Please, PSF, do it this way from now on!

Do which specifically? Leave off a version number or specify one?

@jlovejoy
Copy link
Member Author

jlovejoy commented Aug 5, 2022

Please, PSF, do it this way from now on!

Do which specifically? Leave off a version number or specify one?

leave off version number :)

@jlovejoy
Copy link
Member Author

jlovejoy commented Aug 5, 2022

@swinslow - it's passing now!! yeah! want to merge then :)

@swinslow
Copy link
Member

@jlovejoy Yup -- merging! Thanks everyone for your help in getting this one over the line.

@swinslow swinslow merged commit 201cae9 into master Aug 11, 2022
@swinslow swinslow deleted the jl-python-fun branch August 11, 2022 14:28
@ockham
Copy link

ockham commented Aug 11, 2022

Amazing, thanks all! 🎉

akostadinov added a commit to akostadinov/license-list-XML that referenced this pull request Apr 13, 2023
License was added with spdx#1549 as a follow up on spdx#1200

In spdx#1200 it is stated that the license is FSF approved but no OSI
approved or at least not with the right name. With a link to the FSF
website [1].

So I'm adding this attribute to the license for it to be properly tagged
as FSF approved.

[1] https://www.gnu.org/licenses/license-list.en.html#Python
akostadinov added a commit to akostadinov/license-list-XML that referenced this pull request Apr 13, 2023
License was added with spdx#1549 as a follow up on spdx#1200

Renaming license to match FSF identifier see [1].

[1] https://wking.github.io/fsf-api/licenses-full.json
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.

7 participants