djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci_check_duplicate_usb_vid_pid.py: change 'whitelist' terminology to 'ignorelist'

This commit is contained in:
sommersoft 2020-06-20 08:44:24 -05:00
parent 023054e67a
commit 5d158d884d
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/ci_check_duplicate_usb_vid_pid.py
View File

@ -29,7 +29,7 @@ import pathlib
import re import re
import sys import sys
DEFAULT_WHITELIST = [ DEFAULT_IGNORELIST = [
"circuitplayground_express", "circuitplayground_express",
"circuitplayground_express_crickit", "circuitplayground_express_crickit",
"circuitplayground_express_displayio", "circuitplayground_express_displayio",
@ -43,15 +43,15 @@ DEFAULT_WHITELIST = [
cli_parser = argparse.ArgumentParser(description="USB VID/PID Duplicate Checker") cli_parser = argparse.ArgumentParser(description="USB VID/PID Duplicate Checker")
cli_parser.add_argument( cli_parser.add_argument(
"--whitelist", "--ignorelist",
dest="whitelist", dest="ignorelist",
nargs="?", nargs="?",
action="store", action="store",
default=DEFAULT_WHITELIST, default=DEFAULT_IGNORELIST,
help=( help=(
"Board names to ignore duplicate VID/PID combinations. Pass an empty " "Board names to ignore duplicate VID/PID combinations. Pass an empty "
"string to disable all duplicate ignoring. Defaults are: " "string to disable all duplicate ignoring. Defaults are: "
f"{', '.join(DEFAULT_WHITELIST)}" f"{', '.join(DEFAULT_IGNORELIST)}"
) )
) )
@ -69,7 +69,7 @@ def configboard_files():
) )
return working_dir.glob("ports/**/boards/**/mpconfigboard.mk") return working_dir.glob("ports/**/boards/**/mpconfigboard.mk")
def check_vid_pid(files, whitelist): def check_vid_pid(files, ignorelist):
""" Compiles a list of USB VID & PID values for all boards, and checks """ Compiles a list of USB VID & PID values for all boards, and checks
for duplicates. Exits with ``sys.exit()`` (non-zero exit code) for duplicates. Exits with ``sys.exit()`` (non-zero exit code)
if duplicates are found, and lists the duplicates. if duplicates are found, and lists the duplicates.
@ -90,10 +90,10 @@ def check_vid_pid(files, whitelist):
board_name = board_config.parts[-2] board_name = board_config.parts[-2]
board_whitelisted = False board_ignorelisted = False
if board_name in whitelist: if board_name in ignorelist:
board_whitelisted = True board_ignorelisted = True
board_name += " (whitelisted)" board_name += " (ignorelisted)"
if usb_vid and usb_pid: if usb_vid and usb_pid:
id_group = f"{usb_vid.group(1)}:{usb_pid.group(1)}" id_group = f"{usb_vid.group(1)}:{usb_pid.group(1)}"
@ -104,7 +104,7 @@ def check_vid_pid(files, whitelist):
} }
else: else:
usb_ids[id_group]['boards'].append(board_name) usb_ids[id_group]['boards'].append(board_name)
if not board_whitelisted: if not board_ignorelisted:
usb_ids[id_group]['duplicate'] = True usb_ids[id_group]['duplicate'] = True
duplicates_found = True duplicates_found = True
@ -128,9 +128,9 @@ if __name__ == "__main__":
print("Running USB VID/PID Duplicate Checker...") print("Running USB VID/PID Duplicate Checker...")
print( print(
f"Ignoring the following boards: {', '.join(arguments.whitelist)}", f"Ignoring the following boards: {', '.join(arguments.ignorelist)}",
end="\n\n" end="\n\n"
) )
board_files = configboard_files() board_files = configboard_files()
check_vid_pid(board_files, arguments.whitelist) check_vid_pid(board_files, arguments.ignorelist)