Merge remote-tracking branch 'origin/master' into deterministic-builds

bin/run_test.py

@@ -1,7 +1,9 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-from __future__ import print_function
-import os, sys, subprocess, shutil
+import argparse
+import os
+import subprocess
+import sys
 
 
 def single_run(test_project):
@@ -12,8 +14,6 @@ def single_run(test_project):
 
 
 if __name__ == '__main__':
-    import argparse
-
     parser = argparse.ArgumentParser()
     parser.add_argument("test_project_dir")
     args = parser.parse_args()

bin/run_tests.py

@@ -1,18 +1,19 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-from __future__ import print_function
-import os, sys, subprocess, shutil, json
+import os
+import subprocess
+import sys
 from glob import glob
 
 if __name__ == '__main__':
     # move cwd to the project root
     os.chdir(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-    ### run the unit tests
+    # run the unit tests
 
     subprocess.check_call([sys.executable, '-m', 'pytest', 'unit_test'])
 
-    ### run the integration tests
+    # run the integration tests
 
     test_projects = sorted(glob('test/??_*'))