Skip to content

Commit 098929e

Browse files
committed
ruff auto fix/format
1 parent fff2872 commit 098929e

File tree

4 files changed

+28
-15
lines changed

4 files changed

+28
-15
lines changed

installation_and_upgrade/ibex_install_utils/install_tasks.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ def run_instrument_deploy_main(self) -> None:
256256
self._server_tasks.setup_log_rotation()
257257
self._system_tasks.update_kafka_topics()
258258

259-
260259
def run_instrument_deploy_pre_stop(self) -> None:
261260
"""Upgrade an instrument. Steps to do before ibex is stopped.
262261

installation_and_upgrade/ibex_install_utils/kafka_utils.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
from kafka import KafkaConsumer
22
from kafka.admin import KafkaAdminClient, NewTopic
33

4-
REQUIRED_SUFFIXES = ["_events", "_sampleEnv", "_runInfo", "_forwarderConfig", "_detSpecMap",
5-
"_forwarderStorage", "_forwarderStatus", "_runLog", "_areaDetector",
6-
"_monitorHistograms"]
4+
REQUIRED_SUFFIXES = [
5+
"_events",
6+
"_sampleEnv",
7+
"_runInfo",
8+
"_forwarderConfig",
9+
"_detSpecMap",
10+
"_forwarderStorage",
11+
"_forwarderStatus",
12+
"_runLog",
13+
"_areaDetector",
14+
"_monitorHistograms",
15+
]
716

817

918
def _get_existing_topics(kafka_broker):

installation_and_upgrade/ibex_install_utils/run_process.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def __init__(
2727
expected_return_codes: Union[int, List[int], None] = [0],
2828
capture_last_output=False,
2929
progress_metric=[],
30-
env: dict | None = None
30+
env: dict | None = None,
3131
):
3232
"""
3333
Create a process that needs running

installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from ibex_install_utils.software_dependency.java import Java
1616
from ibex_install_utils.task import task
1717
from ibex_install_utils.tasks import BaseTasks
18-
from ibex_install_utils.tasks.common_paths import APPS_BASE_DIR, EPICS_PATH, VAR_DIR, UV
18+
from ibex_install_utils.tasks.common_paths import APPS_BASE_DIR, EPICS_PATH, UV, VAR_DIR
1919
from ibex_install_utils.version_check import version_check
2020
from win32com.client import Dispatch
2121

@@ -196,7 +196,7 @@ def create_virtual_envs(self):
196196
dirs_with_venvs = []
197197
for root, _, files in os.walk(EPICS_PATH):
198198
for file in files:
199-
if file == 'requirements-frozen.txt':
199+
if file == "requirements-frozen.txt":
200200
dirs_with_venvs.append(root)
201201

202202
for directory in dirs_with_venvs:
@@ -206,14 +206,19 @@ def create_virtual_envs(self):
206206
if os.path.exists(venv):
207207
shutil.rmtree(venv)
208208

209-
RunProcess(working_dir=os.path.join(directory),
210-
executable_file=UV,
211-
prog_args=["venv", venv_name], env={}).run()
212-
213-
RunProcess(working_dir=os.path.join(directory),
214-
executable_file=UV,
215-
prog_args=["pip", "sync", "requirements-frozen.txt"], env={}).run()
216-
209+
RunProcess(
210+
working_dir=os.path.join(directory),
211+
executable_file=UV,
212+
prog_args=["venv", venv_name],
213+
env={},
214+
).run()
215+
216+
RunProcess(
217+
working_dir=os.path.join(directory),
218+
executable_file=UV,
219+
prog_args=["pip", "sync", "requirements-frozen.txt"],
220+
env={},
221+
).run()
217222

218223
@task("Add Nagios checks")
219224
def add_nagios_checks(self) -> None:

0 commit comments

Comments
 (0)