Skip to content

Commit 89f60b3

Browse files
rwalton-armPatater
authored andcommitted
config: Remove support for target.requires
target.requires was never a valid target_override. See #162 for details. Partially reverts 6a99b43.
1 parent df67f6a commit 89f60b3

File tree

3 files changed

+1
-35
lines changed

3 files changed

+1
-35
lines changed

src/mbed_tools/build/_internal/config/assemble_build_config.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,7 @@ def _get_app_filter_labels(mbed_app_data: dict, config: Config) -> None:
8484

8585

8686
def _get_file_filter_overrides(mbed_app_data: dict) -> dict:
87-
return {
88-
"overrides": [
89-
override
90-
for override in mbed_app_data.get("overrides", [])
91-
if override.modifier or override.name == "requires"
92-
]
93-
}
87+
return {"overrides": [override for override in mbed_app_data.get("overrides", []) if override.modifier]}
9488

9589

9690
@dataclass(frozen=True)

src/mbed_tools/build/_internal/config/config.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ def __setitem__(self, key: Hashable, item: Any) -> None:
3535
def _handle_overrides(self, overrides: Iterable[Override]) -> None:
3636
for override in overrides:
3737
logger.debug("Applying override '%s.%s'='%s'", override.namespace, override.name, repr(override.value))
38-
if override.name == "requires":
39-
self.data["requires"] = self.data.get("requires", set()) | override.value
40-
continue
41-
4238
if override.name in self.data:
4339
_apply_override(self.data, override)
4440
continue

tests/build/test_generate_config.py

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -456,30 +456,6 @@ def test_requires_config_option(program):
456456
assert "MBED_LFS_READ_SIZE=64" not in config_text
457457

458458

459-
def test_target_requires_config_option(program):
460-
create_mbed_app_json(program.root, target_overrides={"*": {"target.requires": ["ble"]}})
461-
create_mbed_lib_json(
462-
program.mbed_os.root / "bare-metal" / "mbed_lib.json",
463-
"ble",
464-
target_overrides={"*": {"target.requires": ["platform"]}},
465-
)
466-
create_mbed_lib_json(
467-
program.mbed_os.root / "platform" / "mbed_lib.json", "platform", config={"stdio-baud-rate": {"value": 9600}},
468-
)
469-
create_mbed_lib_json(
470-
program.mbed_os.root / "storage" / "mbed_lib.json",
471-
"filesystem",
472-
config={"read_size": {"macro_name": "MBED_LFS_READ_SIZE", "value": 64}},
473-
)
474-
475-
generate_config("K64F", "GCC_ARM", program)
476-
477-
config_text = (program.files.cmake_build_dir / CMAKE_CONFIG_FILE).read_text()
478-
479-
assert "MBED_CONF_PLATFORM_STDIO_BAUD_RATE=9600" in config_text
480-
assert "MBED_LFS_READ_SIZE=64" not in config_text
481-
482-
483459
def test_config_parsed_when_mbed_os_outside_project_root(program_in_mbed_os_subdir, matching_target_and_filter):
484460
program = program_in_mbed_os_subdir
485461
target, target_filter = matching_target_and_filter

0 commit comments

Comments
 (0)