Skip to content

Update MEMENTO Facial Detection/Recognition Files #2729

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

Merged
merged 7 commits into from
Feb 26, 2024

Conversation

brentru
Copy link
Member

@brentru brentru commented Feb 9, 2024

  • Removes .task.json and merge_bin.py scripts from project, not required
  • Removes zip file used for the project and switches to a folder so users can examine main.cpp from within GitHub. Will update learn element to zip the folder

@brentru brentru requested review from TheKitty and tyeth February 9, 2024 17:22
@brentru
Copy link
Member Author

brentru commented Feb 9, 2024

@TheKitty // SPDX-FileCopyrightText: and // SPDX-License-Identifier: both exist across the files the SPDX checker is rasing errors for.

@TheKitty
Copy link
Collaborator

TheKitty commented Feb 9, 2024

image Apparently it's complaining about some missing license files - perhaps the SPDX licenses are not in the table of SPDX allowed values. Please cross-check with https://spdx.org/licenses/ Also I'm unsure who wrote the SPDX validation tool.

@brentru
Copy link
Member Author

brentru commented Feb 9, 2024

Please cross-check with https://spdx.org/licenses/

I'll take a look, thank you

Also I'm unsure who wrote the SPDX validation tool.

Looks like Eva did, https://github.com/adafruit/Adafruit_Learning_System_Guides/blob/main/SPDX.py#L1

@TheKitty
Copy link
Collaborator

TheKitty commented Feb 9, 2024 via email

Copy link
Contributor

@tyeth tyeth left a comment

Choose a reason for hiding this comment

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

Looks good

@brentru
Copy link
Member Author

brentru commented Feb 14, 2024

@TheKitty I've updated the licenses to match the list.

The tool keeps throwing:

Missing files: ['LICENSES/BSD-2-Claus.txt']

but that file sits within https://github.com/brentru/Adafruit_Learning_System_Guides/tree/main/LICENSES

and none of these files use the "claus" vs "clause" spelling, not sure where it's picking it up from..:
image

@TheKitty
Copy link
Collaborator

Is it possible Eva's code is only checking the first 20 characters of the file and not more?

@tyeth
Copy link
Contributor

tyeth commented Feb 14, 2024

Is it possible Eva's code is only checking the first 20 characters of the file and not more?

yeah it seems like there was some legacy pattern matching, probably stripping trailing windows/line character. Not sure I've seen enough SPDX license lines to know what's expected. This offending line line.split("SPDX-License-Identifier: ")[1][:-1] should probably just trim/strip instead of [:-1], unless is that for a trailing date removal or something? It doesn't quite fit into the spec to just drop the end https://spdx.dev/learn/handling-license-info/#:~:text=SPDX%20IDs%3A%20How%20to%20use

@brentru
Copy link
Member Author

brentru commented Feb 26, 2024

@TheKitty @tyeth is right, the [:-1] at the end would turn the string BSD-2-Clause into BSD-2-Claus, which is not a valid file within LICENSES/.

I have added a check for this on the latest commit, dropping the check at the end and adding a strip() for extraneous whitespace.

Anne, If you agree that this is OK, please merge in.

@TheKitty TheKitty merged commit 082126a into adafruit:main Feb 26, 2024
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.

3 participants