From eb81ddfae95aac93228552e440d9542ccfafe0d2 Mon Sep 17 00:00:00 2001 From: Chris Elion Date: Fri, 17 Jul 2020 09:47:29 -0700 Subject: [PATCH 1/2] explicit python3 for coverage checks --- .yamato/com.unity.ml-agents-test.yml | 2 +- ml-agents/tests/yamato/check_coverage_percent.py | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.yamato/com.unity.ml-agents-test.yml b/.yamato/com.unity.ml-agents-test.yml index a4729281c6..d9d228219d 100644 --- a/.yamato/com.unity.ml-agents-test.yml +++ b/.yamato/com.unity.ml-agents-test.yml @@ -69,7 +69,7 @@ test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}: {% if package.name == "com.unity.ml-agents" %} # TODO get coverage tests running for extensions too - - python ml-agents/tests/yamato/check_coverage_percent.py upm-ci~/test-results/ {{ editor.minCoveragePct }} + - python3 ml-agents/tests/yamato/check_coverage_percent.py upm-ci~/test-results/ {{ editor.minCoveragePct }} {% endif %} artifacts: logs: diff --git a/ml-agents/tests/yamato/check_coverage_percent.py b/ml-agents/tests/yamato/check_coverage_percent.py index 50809bc832..fb0856a482 100644 --- a/ml-agents/tests/yamato/check_coverage_percent.py +++ b/ml-agents/tests/yamato/check_coverage_percent.py @@ -3,8 +3,6 @@ SUMMARY_XML_FILENAME = "Summary.xml" -# Note that this is python2 compatible, since that's currently what's installed on most CI images. - def check_coverage(root_dir, min_percentage): # Walk the root directory looking for the summary file that @@ -30,16 +28,12 @@ def check_coverage(root_dir, min_percentage): pct = float(pct) if pct < min_percentage: print( - "Coverage {} is below the min percentage of {}.".format( - pct, min_percentage - ) + f"Coverage {pct} is below the min percentage of {min_percentage}." ) sys.exit(1) else: print( - "Coverage {} is above the min percentage of {}.".format( - pct, min_percentage - ) + f"Coverage {pct} is above the min percentage of {min_percentage}." ) sys.exit(0) From 3c7e130832241fb0252441467161c46876ad2919 Mon Sep 17 00:00:00 2001 From: Chris Elion Date: Fri, 17 Jul 2020 10:10:12 -0700 Subject: [PATCH 2/2] fix trunk command too --- .yamato/com.unity.ml-agents-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/com.unity.ml-agents-test.yml b/.yamato/com.unity.ml-agents-test.yml index d9d228219d..0fb1e28edb 100644 --- a/.yamato/com.unity.ml-agents-test.yml +++ b/.yamato/com.unity.ml-agents-test.yml @@ -110,7 +110,7 @@ test_{{ package.name }}_{{ platform.name }}_trunk: - upm-ci project test -u {{ editor.version }} --project-path Project --package-filter {{ package.name }} {{ editor.coverageOptions }} {% if package.name == "com.unity.ml-agents" %} # TODO get coverage tests running for extensions too - - python ml-agents/tests/yamato/check_coverage_percent.py upm-ci~/test-results/ {{ editor.minCoveragePct }} + - python3 ml-agents/tests/yamato/check_coverage_percent.py upm-ci~/test-results/ {{ editor.minCoveragePct }} {% endif %} artifacts: logs: