Skip to content

Commit

Permalink
Remove unneeded f-string formatting (#1978)
Browse files Browse the repository at this point in the history
* (fix) rm useless f-string fmt

* (feat) swap negation in if statement

* (fix) rm unused imports
  • Loading branch information
ThibFrgsGmz authored Apr 23, 2023
1 parent a487823 commit 8f4ec61
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 17 deletions.
5 changes: 0 additions & 5 deletions RPI/test/int/rpi_integration_test.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
import os
import platform
import subprocess
import sys
import time
from enum import Enum

from fprime_gds.common.pipeline.standard import StandardPipeline
from fprime_gds.common.testing_fw import predicates
from fprime_gds.common.testing_fw.api import IntegrationTestAPI
from fprime_gds.common.utils.config_manager import ConfigManager
from fprime_gds.common.utils.event_severity import EventSeverity


Expand Down
2 changes: 1 addition & 1 deletion cmake/autocoder/ai-parser/ai_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def print_fprime_dependencies(root, current_library, import_base):
gcc_order.append(dep)
# Find module dependencies, and anything else left over goes last
for dep in dependencies:
if not dep in gcc_order:
if dep not in gcc_order:
gcc_order.append(dep)
# Write out CMake style list
sys.stdout.write(";".join(gcc_order))
Expand Down
4 changes: 2 additions & 2 deletions cmake/autocoder/fpp-locs-differ/fpp-locs-differ.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os
import sys

from fprime_ac.utils.buildroot import build_root_relative_path, set_build_roots
from fprime_ac.utils.buildroot import set_build_roots


def main():
Expand All @@ -23,7 +23,7 @@ def main():
sys.exit(1)
# Previous files not generated
if not os.path.exists(args_ns.prev_locs):
print(f"No pervious locations")
print("No pervious locations")
sys.exit(1)

with open(args_ns.prev_locs, "r") as prev_locs_fh:
Expand Down
2 changes: 1 addition & 1 deletion cmake/settings/ini-to-stdio.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def main():

assert (
setting_value == ut_setting_value
), f"CMake can only parse unittest independent settings"
), "CMake can only parse unittest independent settings"
output = loaded_settings[setting]
handler(output)
except KeyError as key_error:
Expand Down
4 changes: 2 additions & 2 deletions cmake/test/src/test_feature.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def test_feature_library(FEATURE_BUILD):
def test_feature_deployment(FEATURE_BUILD):
"""Feature build check deployment properly detected"""
cmake.assert_process_success(FEATURE_BUILD)
library_name = f"TestDeployment"
library_name = "TestDeployment"
output_path = FEATURE_BUILD["build"] / "bin" / platform.system() / library_name
assert output_path.exists(), f"Failed to locate {library_name} in build output"

Expand Down Expand Up @@ -104,4 +104,4 @@ def test_feature_installation(FEATURE_BUILD):
output_path = (
FEATURE_BUILD["install"] / platform.system() / "bin" / "TestDeployment"
)
assert output_path.exists(), f"Failed to locate TestDeployment in build output"
assert output_path.exists(), "Failed to locate TestDeployment in build output"
6 changes: 3 additions & 3 deletions cmake/test/src/test_ref_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def test_ref_targets(REF_BUILD):
output_path = REF_BUILD["build"] / "lib" / platform.system() / library_name
assert output_path.exists(), f"Failed to locate {library_name} in build output"
output_path = REF_BUILD["build"] / "bin" / platform.system() / "Ref"
assert output_path.exists(), f"Failed to locate Ref in build output"
assert output_path.exists(), "Failed to locate Ref in build output"


def test_ref_installation(REF_BUILD):
Expand All @@ -49,7 +49,7 @@ def test_ref_installation(REF_BUILD):
output_path = REF_BUILD["install"] / platform.system() / "lib" / library_name
assert output_path.exists(), f"Failed to locate {library_name} in build output"
output_path = REF_BUILD["install"] / platform.system() / "bin" / "Ref"
assert output_path.exists(), f"Failed to locate Ref in build output"
assert output_path.exists(), "Failed to locate Ref in build output"


def test_ref_dictionary(REF_BUILD):
Expand All @@ -61,4 +61,4 @@ def test_ref_dictionary(REF_BUILD):
/ "dict"
/ "RefTopologyAppDictionary.xml"
)
assert output_path.exists(), f"Failed to locate Ref in build output"
assert output_path.exists(), "Failed to locate Ref in build output"
6 changes: 3 additions & 3 deletions cmake/test/src/test_unittests.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def test_unittest_targets(UT_BUILD):
assert output_path.exists(), f"Failed to locate {library_name} in build output"
for executable in ["Ref"] + UNIT_TESTS:
output_path = UT_BUILD["build"] / "bin" / platform.system() / executable
assert output_path.exists(), f"Failed to locate Ref in build output"
assert output_path.exists(), "Failed to locate Ref in build output"


def test_unittest_installation(UT_BUILD):
Expand All @@ -91,7 +91,7 @@ def test_unittest_installation(UT_BUILD):
)
assert output_path.exists(), f"Failed to locate {library_name} in build output"
output_path = UT_BUILD["install"] / platform.system() / "bin" / "Ref"
assert output_path.exists(), f"Failed to locate Ref in build output"
assert output_path.exists(), "Failed to locate Ref in build output"


def test_unittest_dictionary(UT_BUILD):
Expand All @@ -103,4 +103,4 @@ def test_unittest_dictionary(UT_BUILD):
/ "dict"
/ "RefTopologyAppDictionary.xml"
)
assert output_path.exists(), f"Failed to locate Ref in build output"
assert output_path.exists(), "Failed to locate Ref in build output"

0 comments on commit 8f4ec61

Please sign in to comment.