From 0032a8038724d089c028a7af3dc84ed1f7c0f75b Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 5 Dec 2023 08:02:34 -0600 Subject: [PATCH 1/2] Change terminology --- circuitpython_build_tools/build.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/circuitpython_build_tools/build.py b/circuitpython_build_tools/build.py index f884a1c..7c0fa25 100644 --- a/circuitpython_build_tools/build.py +++ b/circuitpython_build_tools/build.py @@ -39,7 +39,7 @@ # pyproject.toml `py_modules` values that are incorrect. These should all have PRs filed! # and should be removed when the fixed version is incorporated in its respective bundle. -pyproject_py_modules_blacklist = set(( +pyproject_py_modules_blocklist = set(( # adafruit bundle "adafruit_colorsys", @@ -194,10 +194,10 @@ def get_package_info(library_path, package_folder_prefix): py_modules = get_nested(pyproject_toml, "tool", "setuptools", "py-modules", default=[]) packages = get_nested(pyproject_toml, "tool", "setuptools", "packages", default=[]) - blacklisted = [name for name in py_modules if name in pyproject_py_modules_blacklist] + blocklisted = [name for name in py_modules if name in pyproject_py_modules_blacklist] - if blacklisted: - print(f"{lib_path}/settings.toml:1: {blacklisted[0]} blacklisted: not using metadata from pyproject.toml") + if blocklisted: + print(f"{lib_path}/settings.toml:1: {blocklisted[0]} blacklisted: not using metadata from pyproject.toml") py_modules = packages = () example_files = [sub_path for sub_path in (lib_path / "examples").rglob("*") From f9a8aa3b1a4c28928c1ba7a03d1a16e5dec78f44 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 5 Dec 2023 09:55:11 -0500 Subject: [PATCH 2/2] Change remaining blacklist to blocklist --- circuitpython_build_tools/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circuitpython_build_tools/build.py b/circuitpython_build_tools/build.py index 7c0fa25..0fc240f 100644 --- a/circuitpython_build_tools/build.py +++ b/circuitpython_build_tools/build.py @@ -194,10 +194,10 @@ def get_package_info(library_path, package_folder_prefix): py_modules = get_nested(pyproject_toml, "tool", "setuptools", "py-modules", default=[]) packages = get_nested(pyproject_toml, "tool", "setuptools", "packages", default=[]) - blocklisted = [name for name in py_modules if name in pyproject_py_modules_blacklist] + blocklisted = [name for name in py_modules if name in pyproject_py_modules_blocklist] if blocklisted: - print(f"{lib_path}/settings.toml:1: {blocklisted[0]} blacklisted: not using metadata from pyproject.toml") + print(f"{lib_path}/settings.toml:1: {blocklisted[0]} blocklisted: not using metadata from pyproject.toml") py_modules = packages = () example_files = [sub_path for sub_path in (lib_path / "examples").rglob("*")