From c209cc184e188e4f873e8382e13cd606cd82e69b Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Fri, 5 Jun 2020 18:19:23 -0700 Subject: [PATCH] Work around https://github.com/psf/black/issues/1289 --- launcher/sdw_updater_gui/Updater.py | 4 ++-- launcher/tests/test_updater.py | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/launcher/sdw_updater_gui/Updater.py b/launcher/sdw_updater_gui/Updater.py index 62d1c55..a5a9425 100644 --- a/launcher/sdw_updater_gui/Updater.py +++ b/launcher/sdw_updater_gui/Updater.py @@ -127,7 +127,7 @@ def _check_updates_debian(vm): sdlog.info("Checking for updates {}:{}".format(vm, current_templates[vm])) subprocess.check_call(["qvm-run", current_templates[vm], "sudo apt update"]) subprocess.check_call( - ["qvm-run", current_templates[vm], "[[ $(apt list --upgradable | wc -l) -eq 1 ]]",] + ["qvm-run", current_templates[vm], "[[ $(apt list --upgradable | wc -l) -eq 1 ]]"] ) except subprocess.CalledProcessError as e: sdlog.error( @@ -237,7 +237,7 @@ def _write_updates_status_flag_to_disk(status): try: sdlog.info("Setting update flag to {} in sd-app".format(status.value)) subprocess.check_call( - ["qvm-run", "sd-app", "echo '{}' > {}".format(status.value, flag_file_path_sd_app),] + ["qvm-run", "sd-app", "echo '{}' > {}".format(status.value, flag_file_path_sd_app)] ) except subprocess.CalledProcessError as e: sdlog.error("Error writing update status flag to sd-app") diff --git a/launcher/tests/test_updater.py b/launcher/tests/test_updater.py index bfb624b..57741c6 100644 --- a/launcher/tests/test_updater.py +++ b/launcher/tests/test_updater.py @@ -204,7 +204,7 @@ def test_check_updates_calls_correct_commands( subprocess_call_list = [ call(["qvm-run", current_templates[vm], "sudo apt update"]), call( - ["qvm-run", current_templates[vm], "[[ $(apt list --upgradable | wc -l) -eq 1 ]]",] + ["qvm-run", current_templates[vm], "[[ $(apt list --upgradable | wc -l) -eq 1 ]]"] ), ] check_output_call_list = [ diff --git a/setup.py b/setup.py index 5bda10b..12216d2 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ license="GPLv3+", python_requires=">=3.5", url="https://github.com/freedomofpress/securdrop-workstation", - data_files=[("share/securedrop-workstation-dom0-config", ["config.json.example"]),], + data_files=[("share/securedrop-workstation-dom0-config", ["config.json.example"])], classifiers=( "Development Status :: 3 - Alpha", "Programming Language :: Python :: 3",