Skip to content

Commit 7df1b0f

Browse files
[Automated Commit] Format Codebase [skip ci]
1 parent 63f3c42 commit 7df1b0f

3 files changed

Lines changed: 12 additions & 18 deletions

File tree

automation/script/docker.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ def dockerfile(self_module, input_params):
5353
self_module.run_state = self_module.init_run_state(
5454
input_params.get('run_state'))
5555

56-
r = self_module.update_run_state_for_selected_script_and_variations(script, input_params)
56+
r = self_module.update_run_state_for_selected_script_and_variations(
57+
script, input_params)
5758

5859
run_state = self_module.run_state
5960

@@ -62,7 +63,6 @@ def dockerfile(self_module, input_params):
6263
for key in docker_settings_default_env:
6364
env.setdefault(key, docker_settings_default_env[key])
6465

65-
6666
if is_true(docker_settings.get('pass_docker_to_script', False)):
6767
input_params['docker'] = True
6868
r = self_module.run(input_params)
@@ -272,23 +272,23 @@ def docker_run(self_module, i):
272272
[])) # do we need a copy here?
273273
variations = meta.get('variations', {})
274274

275-
276275
if not hasattr(self_module, 'run_state'):
277276
self_module.run_state = self_module.init_run_state(
278277
input_params.get('run_state'))
279-
280-
r = self_module.update_run_state_for_selected_script_and_variations(script, i)
278+
279+
r = self_module.update_run_state_for_selected_script_and_variations(
280+
script, i)
281281
if r['return'] > 0:
282282
return r
283283

284284
run_state = self_module.run_state
285-
285+
286286
# take the folder path as well as file path env variables from meta
287287
file_path_env_keys = run_state.get('file_path_env_keys', [])
288288
folder_path_env_keys = run_state.get('folder_path_env_keys', [])
289289

290290
docker_settings = run_state.get('docker', {})
291-
291+
292292
docker_settings_default_env = docker_settings.get('default_env', {})
293293
for key in docker_settings_default_env:
294294
env.setdefault(key, docker_settings_default_env[key])

automation/script/module.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def init_run_state(self, run_state):
132132
run_state.setdefault(d, {})
133133

134134
for l in ['deps', 'post_deps', 'prehook_deps', 'posthook_deps',
135-
'new_env_keys', 'new_state_keys', 'file_path_env_keys',
135+
'new_env_keys', 'new_state_keys', 'file_path_env_keys',
136136
'folder_path_env_keys', 'version_info', 'full_deps']:
137137
run_state.setdefault(l, [])
138138

@@ -4406,15 +4406,15 @@ def update_run_state_for_selected_script_and_variations(self, script, i):
44064406

44074407
tag_values = i.get('tags', '').split(",")
44084408
variation_tags = [tag[1:] for tag in tag_values if tag.startswith("_")]
4409-
4409+
44104410
script_alias = script.meta.get('alias', '')
44114411
script_uid = script.meta.get('uid', '')
44124412

44134413
run_state = self.run_state
44144414
run_state.update({
44154415
'script_id': f"{script_alias},{script_uid}",
44164416
'script_variation_tags': variation_tags
4417-
}
4417+
}
44184418
)
44194419

44204420
r = self.update_state_from_meta(
@@ -4435,10 +4435,6 @@ def update_run_state_for_selected_script_and_variations(self, script, i):
44354435
return {'return': 0, 'run_state': run_state}
44364436

44374437

4438-
4439-
4440-
4441-
44424438
##########################################################################
44434439

44444440

automation/script/remote_run.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,19 @@ def remote_run(self_module, i):
5656
'alias', ''), meta.get(
5757
'uid', '')
5858

59-
r = self_module.update_run_state_for_selected_script_and_variations(script, i)
59+
r = self_module.update_run_state_for_selected_script_and_variations(
60+
script, i)
6061
if r['return'] > 0:
6162
return r
6263

6364
run_state = self_module.run_state
6465

65-
6666
remote_run_settings = run_state.get('remote_run', {})
6767
remote_run_settings_default_env = remote_run_settings.get(
6868
'default_env', {})
6969
for key in remote_run_settings_default_env:
7070
env.setdefault(key, remote_run_settings_default_env[key])
7171

72-
7372
remote_env = {}
7473

7574
env = self_module.env
@@ -151,7 +150,6 @@ def remote_run(self_module, i):
151150
return {'return': 0}
152151

153152

154-
155153
def call_remote_run_prepare(self_module, meta, script_item, i):
156154

157155
path_to_customize_py = os.path.join(script_item.path, 'customize.py')

0 commit comments

Comments
 (0)