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

SMLNJ: add markup for template #1441 #1446

Merged
merged 4 commits into from
May 8, 2022

Conversation

johnmhoran
Copy link
Collaborator

This modifies the markup for SMLNJ to permit copyright holders other than those
named in the SMLNJ license to use the license.

Signed-off-by: John M. Horan [email protected]

This modifies the markup for SMLNJ to permit copyright holders other than those
named in the SMLNJ license to use the license.

Signed-off-by: John M. Horan <[email protected]>
@johnmhoran johnmhoran mentioned this pull request Apr 13, 2022
@swinslow
Copy link
Member

Hi @johnmhoran, I left a comment about the failing test here at #1441 (comment) -- take a look and see what you think.

@johnmhoran
Copy link
Collaborator Author

Thanks @swinslow -- I replied with a comment in the issue and made the change you suggested. If not already documented, we might want to document this error and process, and maybe even tackle it when a duplicate/deprecation is initially created?

@goneall
Copy link
Member

goneall commented Apr 14, 2022

@johnmhoran Please add ,"Duplicates licenses: SMLNJ-NJ, StandardML" to the expected warnings file to cover a possible case where the files are checked in the reverse order.

I agree we should document this. It looks like the right place to add it is the new-license-workflow.md file.

@goneall
Copy link
Member

goneall commented Apr 14, 2022

If not already documented, we might want to document this error and process, and maybe even tackle it when a duplicate/deprecation is initially created?

I'll work on a PR to the new-license-workflow this morning

@johnmhoran
Copy link
Collaborator Author

Thank you @goneall . One question -- I don't follow the syntax -- do you perhaps mean ,"Duplicates licenses: StandardML-NJ, SMLNJ" rather than ,"Duplicates licenses: SMLNJ-NJ, StandardML"?

Also, since this is not a new license but an edit to an existing one, I'd have thought this error would have been thrown, and resolved, when the most recent of the 2 was first added?

@goneall
Copy link
Member

goneall commented Apr 14, 2022

I added a PR #1447 to document the duplicate licenses

@goneall
Copy link
Member

goneall commented Apr 14, 2022

@johnmhoran

do you perhaps mean ,"Duplicates licenses: StandardML-NJ, SMLNJ" rather than ,"Duplicates licenses: SMLNJ-NJ, StandardML"

In addition to, not rather than. The order in which the licenses are checked isn't deterministic, so we need to add both directions in the expected warnings.

Also, since this is not a new license but an edit to an existing one, I'd have thought this error would have been thrown, and resolved, when the most recent of the 2 was first added?

I haven't verified it, but my guess is that the additional markup added caused the match. The CI/CD runs a license matching per the matching guidelines including processing the alt/optional tags.

@johnmhoran
Copy link
Collaborator Author

@goneall I'm confused re the syntax. If I understand correctly, the 2 identifiers are SMLNJ and StandardML-NJ. What are SMLNJ-NJ and StandardML? The latter are not reversing the order of the files but rather are changing the identifiers themselves.

@goneall
Copy link
Member

goneall commented Apr 14, 2022

Just FYI - there is an issue to enhance the warnings processing to make it a bit easier to maintain: spdx/LicenseListPublisher#117

Looking for volunteers to implement.

@goneall
Copy link
Member

goneall commented Apr 14, 2022

I'm confused re the syntax. If I understand correctly, the 2 identifiers are SMLNJ and StandardML-NJ. What are SMLNJ-NJ and StandardML? The latter are not reversing the order of the files but rather are changing the identifiers themselves.

Oops - that was a typo. Just reverse the order.

@goneall
Copy link
Member

goneall commented Apr 14, 2022

I just added an issue for the LicenseListPublisher to ignore duplicates if one or both of the licenses are marked as deprecated. It would be an easy fix - I just want to check with @jlovejoy and @swinslow to make sure they agree this is a good idea.

@johnmhoran
Copy link
Collaborator Author

Thanks @goneall -- just added the reverse-order warning as discussed.

Copy link
Member

@goneall goneall left a comment

Choose a reason for hiding this comment

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

Thanks @johnmhoran - looks good

@jlovejoy jlovejoy added the XML markup change potential change or addition to XML markup in license label May 8, 2022
@jlovejoy jlovejoy added this to the 3.17 milestone May 8, 2022
@swinslow
Copy link
Member

swinslow commented May 8, 2022

Hi @johnmhoran, because the expected-warnings file had changed in parallel in another PR, there was a conflict with this PR. I've resolved that now and the tests are re-running -- assuming they pass, this should be all good to go!

@swinslow swinslow merged commit f164e12 into spdx:master May 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
XML markup change potential change or addition to XML markup in license
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants