From 79d912fc8060651808119069f5fe0ccd5cb97d38 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Tue, 1 Mar 2022 17:13:20 +0100 Subject: [PATCH] adaptions for windows in lint script --- lint.py | 7 +++++-- spacepackets | 2 +- tmtccmd | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lint.py b/lint.py index 27291b2..e91bd36 100755 --- a/lint.py +++ b/lint.py @@ -11,8 +11,11 @@ def main(): ) additional_flags_both_steps = "--count --statistics" additional_flags_first_step = "--select=E9,F63,F7,F82 --show-source" + python_exe = "" + if os.name == "nt": + python_exe = "py -m" flake8_first_step_cmd = ( - f"flake8 . {additional_flags_both_steps} " + f"{python_exe} flake8 . {additional_flags_both_steps} " f"{additional_flags_first_step} {exclude_dirs_flag}" ) status = os.system(flake8_first_step_cmd) @@ -29,7 +32,7 @@ def main(): if not os.path.exists("setup.cfg"): additional_flags_second_step += " --max-line-length=100" flake8_second_step_cmd = ( - f"flake8 . {additional_flags_both_steps} {additional_flags_second_step}" + f"{python_exe} flake8 . {additional_flags_both_steps} {additional_flags_second_step}" f" {exclude_dirs_flag}" ) os.system(flake8_second_step_cmd) diff --git a/spacepackets b/spacepackets index 8580a08..0039a0e 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit 8580a08e9876efc542e19dc957f220be3b250dc8 +Subproject commit 0039a0ec67217765b9dabfbc35dcb34b6ff81c08 diff --git a/tmtccmd b/tmtccmd index f7bbf4b..49cf288 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit f7bbf4bd9f6dc169a8b9e6a76fa9ef0aceb341d4 +Subproject commit 49cf288831216c0680aedab88e31d684ba5b8da8