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

Add NCBI-PD #2433

Merged
merged 6 commits into from
May 15, 2024
Merged

Add NCBI-PD #2433

merged 6 commits into from
May 15, 2024

Conversation

Pandapip1
Copy link
Contributor

@Pandapip1 Pandapip1 commented Mar 28, 2024

Closes #2419

src/NCBI-PD.xml Outdated Show resolved Hide resolved
@xsuchy
Copy link
Collaborator

xsuchy commented Mar 28, 2024

First please wait till the issue is approved.
Then include the test test/simpleTestForGenerator/SPDX_ID.txt and validate it before submitting:
./test-one-license SPDX_ID

@Pandapip1
Copy link
Contributor Author

First please wait till the issue is approved.

Moving PR to draft.

@Pandapip1 Pandapip1 marked this pull request as draft March 28, 2024 19:04
@Pandapip1 Pandapip1 force-pushed the ncbi-pd branch 5 times, most recently from f0e2dd4 to 1409961 Compare May 9, 2024 17:05
@Pandapip1 Pandapip1 marked this pull request as ready for review May 9, 2024 17:06
@Pandapip1
Copy link
Contributor Author

Pandapip1 commented May 9, 2024

Requesting @swinslow for review, re-labeling, and adding the milestone

@Pandapip1
Copy link
Contributor Author

Pandapip1 commented May 9, 2024

I found a few more variations of the text, ergo the commits. I'd test it locally but it doesn't work for some reason.

@jlovejoy jlovejoy added this to the 3.24 milestone May 9, 2024
@jlovejoy
Copy link
Member

jlovejoy commented May 9, 2024

@swinslow - can you review? I think some of the markup we usually do a bit differently

@Pandapip1 Pandapip1 force-pushed the ncbi-pd branch 2 times, most recently from af50be1 to 368a3a8 Compare May 9, 2024 18:15
@Pandapip1
Copy link
Contributor Author

I can't figure out why it's failing. Any tips?

@xsuchy
Copy link
Collaborator

xsuchy commented May 13, 2024

Normal text of license does not match starting at line #1 column #5 "software" when comparing to template text "PUBLIC DOMAIN NOTICE

You are missing the tile text in the test file.

@Pandapip1 Pandapip1 force-pushed the ncbi-pd branch 2 times, most recently from d39aace to d0f2a5a Compare May 14, 2024 14:52
@Pandapip1
Copy link
Contributor Author

Added the title; it's still failing with what appears to be the same error. If you'd like to take over this PR, I'd totally understand. Otherwise, got any ideas as to why it's failing? Everything seems to be correct, but for some reason the regexes aren't matching correctly.

@jlovejoy
Copy link
Member

I'm having a go at updating this in small increments. Also adding some line breaks to make it easier to "see" what is going on.

@jlovejoy
Copy link
Member

ok, so there were a bunch of optional tags that shouldn't be there. Also, I don't see any variation in the Github search that @swinslow did that has "created" instead of "written" - we only add markup for variations actually found (and sparingly). But if I missed something, let me know!

Also, given that all of these have the same name in them (National Center for Biotechnology Information / NLM) - I'd be inclined to not mark that up at this point.

We can always add markup if we find variations later

@jlovejoy
Copy link
Member

there was the following markup: and <alt match="thus cannot be copyrighted|is not subject to copyright in the United States \(17 USC 105\)" name="nocopyright">thus cannot be copyrighted</alt>.

However, I don't see any variation of this sort, nor did @swinslow mention this. Did I miss something?

@jlovejoy
Copy link
Member

ok, last item to consider: the FAQ added at the end as optional - I only see this in one instance. I'd be inclined to just leave it out. It's not part of the license in any case and I think scanning tools can sort this one out

@jlovejoy jlovejoy requested a review from swinslow May 14, 2024 18:55
Copy link
Collaborator

@xsuchy xsuchy left a comment

Choose a reason for hiding this comment

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

Technically speaking the alt matches can be simplified, but this way it is more readable. So +1 from me.

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.

LGTM; if needed, we can tweak the markup again to add additional variations for future releases. Thank you all!

@swinslow swinslow merged commit eae14db into spdx:main May 15, 2024
2 checks passed
@Pandapip1 Pandapip1 deleted the ncbi-pd branch May 15, 2024 16:33
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.

New license request: NCBI-PD [SPDX-Online-Tools]
4 participants