Merge pull request #79190 from falcon78921/wip-k8s-hack-fix

hack: fixed issues from previous refactor PR
This commit is contained in:
Kubernetes Prow Robot
2019-06-27 21:19:20 -07:00
committed by GitHub

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright 2016 The Kubernetes Authors. # Copyright 2016 The Kubernetes Authors.
# #
@@ -71,7 +71,7 @@ def get_test_names_from_local_files():
def load_owners(fname): def load_owners(fname):
owners = {} owners = {}
with pathlib.Path.open(fname) as f: with pathlib.Path(fname).open() as f:
for n, cols in enumerate(csv.reader(f)): for n, cols in enumerate(csv.reader(f)):
if n == 0: if n == 0:
continue # header continue # header
@@ -85,7 +85,7 @@ def load_owners(fname):
def write_owners(fname, owners): def write_owners(fname, owners):
with pathlib.Path.open(fname, 'w') as f: with pathlib.Path(fname).open(mode='w') as f:
out = csv.writer(f, lineterminator='\n') out = csv.writer(f, lineterminator='\n')
out.writerow(['name', 'owner', 'auto-assigned', 'sig']) out.writerow(['name', 'owner', 'auto-assigned', 'sig'])
items = sorted(owners.items()) items = sorted(owners.items())
@@ -175,7 +175,7 @@ def main():
prefixes = sig_prefixes(owners) prefixes = sig_prefixes(owners)
with pathlib.Path.open(OWNERS_JSON_PATH, 'w') as f: with pathlib.Path(OWNERS_JSON_PATH).open(mode='w') as f:
f.write(prefixes + '\n') f.write(prefixes + '\n')
if options.print_sig_prefixes: if options.print_sig_prefixes:
@@ -205,11 +205,11 @@ def main():
owners.pop(name) owners.pop(name)
if not options.addonly: if not options.addonly:
print('# UNEXPECTED MAINTAINERS ',) print('# UNEXPECTED MAINTAINERS ')
print('(randomly assigned, but not in kubernetes-maintainers)') print('(randomly assigned, but not in kubernetes-maintainers)')
for name, (owner, random_assignment, _) in sorted(owners.iteritems()): for name, (owner, random_assignment, _) in sorted(owners.iteritems()):
if random_assignment and owner not in maintainers: if random_assignment and owner not in maintainers:
print('%-16s %s', (owner, name)) print('%-16s %s' % (owner,name))
owners.pop(name) owners.pop(name)
owner_counts = collections.Counter( owner_counts = collections.Counter(
@@ -228,7 +228,7 @@ def main():
if options.user.lower() == 'random': if options.user.lower() == 'random':
print('# Tests per maintainer:') print('# Tests per maintainer:')
for owner, count in owner_counts.most_common(): for owner, count in owner_counts.most_common():
print('%-20s %3d', (owner, count)) print('%-20s %3d' % (owner,count))
write_owners(OWNERS_PATH, owners) write_owners(OWNERS_PATH, owners)