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

Remove unnecessary None provided as default #91

Merged
merged 2 commits into from
Jun 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/fprime/fbuild/cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def set_verbose(self, verbose):
def validate_cmake_cache(self, cmake_args, build_dir):
cmake_cache = self._read_cache(build_dir)
for key, expected in cmake_args.items():
actual = cmake_cache.get(key, None)
actual = cmake_cache.get(key)
# Allow expected variables not to be set in cache.
# When building with a newer version of fprime-util and an older version of F prime,
# newer CMake options that aren't used by older versions of CMake won't be set in the cache
Expand Down Expand Up @@ -358,7 +358,7 @@ def _read_values_from_cache(self, keys, build_dir):
"""
cache = self._read_cache(build_dir)
# Reads cache values suppressing KeyError, {}.get(x, default=None)
miner = lambda x: cache.get(x, None)
miner = lambda x: cache.get(x)
return tuple(map(miner, keys))

def _read_cache(self, build_dir):
Expand Down
2 changes: 1 addition & 1 deletion src/fprime/fbuild/interaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ def new_port(deployment: Path, build: Build):
else:
add_port_to_cmake(str(path_to_cmakelists), fname)

if proj_root_found is False:
if not proj_root_found:
print(
"[INFO] No project root found. Created port without adding to build system nor generating implementation."
)
Expand Down