Merge pull request #21428 from lidizheng/fix-py3checker

Make gen_build_yaml py23 agnostic
pull/21515/head
Lidi Zheng 5 years ago committed by GitHub
commit a27b2c2015
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      test/core/end2end/gen_build_yaml.py
  2. 2
      tools/buildgen/generate_build_additions.sh
  3. 2
      tools/buildgen/generate_projects.py
  4. 2
      tools/buildgen/generate_projects.sh

@ -1,4 +1,3 @@
#!/usr/bin/env python2.7
# Copyright 2015 gRPC authors. # Copyright 2015 gRPC authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@ -16,6 +15,7 @@
"""Generates the appropriate build.json data for all the end2end tests.""" """Generates the appropriate build.json data for all the end2end tests."""
from __future__ import print_function
import yaml import yaml
import collections import collections
@ -405,7 +405,7 @@ def main():
for t in END2END_TESTS.keys() for t in END2END_TESTS.keys()
) )
} }
print yaml.dump(json) print(yaml.dump(json))
if __name__ == '__main__': if __name__ == '__main__':

@ -33,6 +33,6 @@ gen_build_files=""
for gen_build_yaml in $gen_build_yaml_dirs for gen_build_yaml in $gen_build_yaml_dirs
do do
output_file=`mktemp /tmp/genXXXXXX` output_file=`mktemp /tmp/genXXXXXX`
$gen_build_yaml/gen_build_yaml.py > $output_file python $gen_build_yaml/gen_build_yaml.py > $output_file
gen_build_files="$gen_build_files $output_file" gen_build_files="$gen_build_files $output_file"
done done

@ -1,5 +1,3 @@
#!/usr/bin/env python2.7
# Copyright 2015 gRPC authors. # Copyright 2015 gRPC authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");

@ -30,6 +30,6 @@ fi
. tools/buildgen/generate_build_additions.sh . tools/buildgen/generate_build_additions.sh
tools/buildgen/generate_projects.py build.yaml $gen_build_files $* python tools/buildgen/generate_projects.py build.yaml $gen_build_files $*
rm $gen_build_files rm $gen_build_files

Loading…
Cancel
Save