applying black. swapping wheel handling to logging.

scbedd · scbedd · commit fbd353e52cd0 · 2019-08-13T13:57:09.000-07:00
diff --git a/eng/tox/create_wheel_and_install.py b/eng/tox/create_wheel_and_install.py
@@ -1,7 +1,10 @@
-from __future__ import print_function
+from __future__ import logging.info_function
 from subprocess import check_call
 import argparse
 import os
+import logging
+
+logging.getLogger().setLevel(logging.INFO)
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
@@ -25,6 +28,7 @@
 
     args = parser.parse_args()
 
+
     check_call(
         [
             "python",
@@ -51,13 +55,13 @@
                 check_call(
                     ["pip", "install", os.path.join(args.distribution_directory, wheel)]
                 )
-                print("Installed {w} from wheel directory".format(w=wheel))
+                logging.info("Installed {w} from wheel directory".format(w=wheel))
             # it does't exist, so we need to error out
             else:
-                print("{w} not present in the prebuilt wheels directory. Exiting.")
+                logging.error("{w} not present in the prebuilt wheels directory. Exiting.")
                 exit(1)
         else:
             check_call(
                 ["pip", "install", os.path.join(args.distribution_directory, wheel)]
             )
-            print("Installed {w} from fresh wheel.".format(w=wheel))
+            logging.info("Installed {w} from fresh wheel.".format(w=wheel))
diff --git a/scripts/devops_tasks/setup_execute_tests.py b/scripts/devops_tasks/setup_execute_tests.py
@@ -44,7 +44,7 @@ def clean_coverage():
             cleanup_folder(coverage_dir)
         else:
             raise
-        
+
 
 def prep_tests(targeted_packages, python_version):
     logging.info("running test setup for {}".format(targeted_packages))
@@ -150,7 +150,7 @@ def prep_and_run_tox(targeted_packages, tox_env, options_array=[]):
                 [package_dir],
             )
         ):
-            options_array.append("--suppress-no-test-exit-code")
+            tox_execution_array.append("--suppress-no-test-exit-code")
 
         # if not present, re-use base
         if not os.path.exists(destination_tox_ini):
@@ -171,6 +171,7 @@ def prep_and_run_tox(targeted_packages, tox_env, options_array=[]):
 
         run_check_call(tox_execution_array, package_dir)
 
+    # TODO: a bit smarter here
     if not tox_env:
         collect_tox_coverage_files(targeted_packages)
 
@@ -233,9 +234,11 @@ def collect_tox_coverage_files(targeted_packages):
         shutil.move(source, dest)
 
 
-def execute_global_install_and_test(parsed_args, targeted_packages, extended_pytest_args):
+def execute_global_install_and_test(
+    parsed_args, targeted_packages, extended_pytest_args
+):
     if args.mark_arg:
-        extended_pytest_args.extend(["-m", "\"{}\"".format(args.mark_arg)])
+        extended_pytest_args.extend(["-m", '"{}"'.format(args.mark_arg)])
 
     if args.runtype == "setup" or args.runtype == "all":
         prep_tests(targeted_packages, args.python_version)
@@ -350,4 +353,4 @@ def execute_tox_harness(parsed_args, targeted_packages, extended_pytest_args):
     if args.runtype != "none":
         execute_global_install_and_test(args, targeted_packages, extended_pytest_args)
     else:
-        execute_tox_harness(args, targeted_packages, extended_pytest_args)
+        execute_tox_harness(args, targeted_packages, extended_pytest_args)
