Skip to content

Commit 9052c85

Browse files
committed
Run formatting
1 parent bc6a43e commit 9052c85

File tree

2 files changed

+54
-35
lines changed

2 files changed

+54
-35
lines changed

run.py

+25-16
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
try:
88
import config as cfg
99
except ImportError:
10+
1011
class cfg(object):
1112
slots_to_check = StatusChecker.slots_to_check
1213
platforms_to_check = StatusChecker.platforms_to_check
@@ -136,28 +137,36 @@ def mkconfig(date, slots, platforms, projects):
136137
project_names=projects,
137138
)
138139
slots_list = [sn for sn in checker._slots.keys()]
139-
miss_slots = [sn for sn in StatusChecker.slots_to_check
140-
if sn not in slots_list]
140+
miss_slots = [
141+
sn for sn in StatusChecker.slots_to_check if sn not in slots_list
142+
]
141143
if len(miss_slots) > 0:
142-
logging.warning("Hardcoded default slots {} not found in Nightly page."
143-
" Maybe update package!".format(', '.join(miss_slots)))
144+
logging.warning(
145+
"Hardcoded default slots {} not found in Nightly page."
146+
" Maybe update package!".format(", ".join(miss_slots))
147+
)
144148
for slot, build in checker._slots.items():
145149
r = checker._get_Platforms_Projects_for_slot(slot, build)
146150
project_list += [pn for pn in r[1] if pn not in project_list]
147151
platform_list += [pn for pn in r[0] if pn not in platform_list]
148-
slots_str = pretty_sep.join(['"{}"'.format(ss)
149-
for ss in slots_list])
150-
projects_str = pretty_sep.join(['"{}"'.format(ss)
151-
for ss in project_list])
152-
platforms_str = pretty_sep.join(['"{}"'.format(ss)
153-
for ss in platform_list])
154-
with open("config.py", 'w', encoding='utf-8') as fp:
155-
fp.write(cfg_code.format(slots_list=slots_str,
156-
project_list=projects_str,
157-
platform_list=platforms_str))
152+
slots_str = pretty_sep.join(['"{}"'.format(ss) for ss in slots_list])
153+
projects_str = pretty_sep.join(['"{}"'.format(ss) for ss in project_list])
154+
platforms_str = pretty_sep.join(
155+
['"{}"'.format(ss) for ss in platform_list]
156+
)
157+
with open("config.py", "w", encoding="utf-8") as fp:
158+
fp.write(
159+
cfg_code.format(
160+
slots_list=slots_str,
161+
project_list=projects_str,
162+
platform_list=platforms_str,
163+
)
164+
)
158165
fp.flush()
159-
logging.info("'config.py' file written to disk. "
160-
"Edit accordingly and run script again for desired function.")
166+
logging.info(
167+
"'config.py' file written to disk. "
168+
"Edit accordingly and run script again for desired function."
169+
)
161170

162171

163172
cli.add_command(current_status)

status_checker.py

+29-19
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818
def tokenizePlatforms(plist):
1919
tree = {}
2020
for pp in set(plist):
21-
toks = pp.split('-', 3)
21+
toks = pp.split("-", 3)
2222
for i in range(0, 4):
23-
tk = '-'.join(toks[0:i])
23+
tk = "-".join(toks[0:i])
2424
if tk in tree:
2525
tree[tk].append(pp)
2626
else:
27-
tree[tk] = [pp, ]
27+
tree[tk] = [
28+
pp,
29+
]
2830
return tree
2931

3032

@@ -130,8 +132,8 @@ def get_current_builds(self):
130132
logging.debug(f"Found build ids: {dict(self._slots)}.")
131133

132134
def _get_short_platforms(
133-
self,
134-
plist: [],
135+
self,
136+
plist: [],
135137
) -> []:
136138
"""Return list of short platform names to check in results.
137139
Replace common prefixes by * w.r.t. previous platform considered."""
@@ -150,14 +152,14 @@ def _get_short_platforms(
150152
ret.append(pc)
151153
else:
152154
ss = slice(len(pk), len(pc))
153-
ret.append('*' + pc[ss])
155+
ret.append("*" + pc[ss])
154156
pp = pc
155157
return ret
156158

157159
def _get_Platforms_Projects_for_slot(
158-
self,
159-
slot: str,
160-
build_id: int,
160+
self,
161+
slot: str,
162+
build_id: int,
161163
) -> ([], []):
162164
response = requests.get(f"{self.api_page}/{slot}/{build_id}/summary")
163165
response.raise_for_status()
@@ -166,11 +168,12 @@ def _get_Platforms_Projects_for_slot(
166168
projects = []
167169
if parsed["aborted"]:
168170
return platforms, projects
169-
if 'platforms' in parsed:
170-
platforms = parsed['platforms']
171-
if 'projects' in parsed:
172-
projects = [pdic['name'] for pdic in parsed['projects']
173-
if pdic['enabled']]
171+
if "platforms" in parsed:
172+
platforms = parsed["platforms"]
173+
if "projects" in parsed:
174+
projects = [
175+
pdic["name"] for pdic in parsed["projects"] if pdic["enabled"]
176+
]
174177
return platforms, projects
175178

176179
def _fetch_build_info(
@@ -194,8 +197,11 @@ def _fetch_build_info(
194197
and project["enabled"]
195198
):
196199
if df.empty:
197-
long_platforms = [pn for pn in self.platforms_to_check
198-
if pn in project['results']]
200+
long_platforms = [
201+
pn
202+
for pn in self.platforms_to_check
203+
if pn in project["results"]
204+
]
199205
long_platforms.sort(reverse=True)
200206
short_platforms = self._get_short_platforms(long_platforms)
201207
# short_platforms = [
@@ -204,17 +210,21 @@ def _fetch_build_info(
204210
# for platform in self.platforms_to_check
205211
# if platform in project["results"]
206212
# ]
207-
# make short platform names unique for PANDA (add +1,+2, ... to same names in list)
213+
# make short platform names unique for PANDA
214+
# (add +1,+2, ... to same names in list)
208215
ssplatforms = set(short_platforms)
209216
if len(ssplatforms) < len(short_platforms):
210217
for pn in ssplatforms:
211-
if not pn.startswith('*') or short_platforms.count(pn) == 1:
218+
if (
219+
not pn.startswith("*")
220+
or short_platforms.count(pn) == 1
221+
):
212222
continue
213223
pc = 1
214224
while True:
215225
try:
216226
ip = short_platforms.index(pn)
217-
short_platforms[ip] += '!{}'.format(pc)
227+
short_platforms[ip] += "!{}".format(pc)
218228
pc += 1
219229
except ValueError:
220230
break

0 commit comments

Comments
 (0)