Merge pull request #1287 from HaoZeke/splitBench

ENH: Cleanup with `asv_runner`

asv/commands/__init__.py

@@ -4,7 +4,8 @@
 import sys
 import abc
 
-from .. import config, util
+from asv import config, util
+
 from . import common_args
 
 # This list is ordered in order of average workflow

asv/commands/compare.py

@@ -4,14 +4,16 @@
 import math
 
 import tabulate
+from asv_runner.console import color_print
+from asv_runner.statistics import get_err
 
 from . import Command, common_args
 from ..benchmarks import Benchmarks
 from ..machine import iter_machine_files
 from ..results import iter_results_for_machine_and_hash
 from ..repo import get_repo, NoSuchNameError
 from ..util import human_value, load_json
-from ..console import log, color_print
+from ..console import log
 from ..environment import get_environments
 from .. import util, statistics
 
@@ -265,12 +267,12 @@ def results_default_iter(commit_hash):
                 time_2 = math.nan
 
             if benchmark in ss_1 and ss_1[benchmark][0]:
-                err_1 = statistics.get_err(time_1, ss_1[benchmark][0])
+                err_1 = get_err(time_1, ss_1[benchmark][0])
             else:
                 err_1 = None
 
             if benchmark in ss_2 and ss_2[benchmark][0]:
-                err_2 = statistics.get_err(time_2, ss_2[benchmark][0])
+                err_2 = get_err(time_2, ss_2[benchmark][0])
             else:
                 err_2 = None
 

asv/commands/continuous.py

@@ -3,11 +3,13 @@
 import os
 import argparse
 
+from asv_runner.console import color_print
+
 from . import Command, common_args
 from .run import Run
 from .compare import Compare
 from ..repo import get_repo, NoSuchNameError
-from ..console import color_print, log
+from ..console import log
 from .. import results, util
 
 

asv/commands/profiling.py

@@ -7,9 +7,11 @@
 import sys
 import tempfile
 
+from asv_runner.console import color_print
+
 from . import Command, common_args
 from ..benchmarks import Benchmarks
-from ..console import log, color_print
+from ..console import log
 from ..environment import get_environments, is_existing_only
 from ..machine import Machine
 from ..profiling import ProfilerGui

asv/commands/quickstart.py

@@ -3,8 +3,10 @@
 import os
 import shutil
 
+from asv_runner.console import color_print
+
 from . import Command
-from ..console import log, color_print
+from ..console import log
 
 
 class Quickstart(Command):

asv/commands/rm.py

@@ -2,8 +2,9 @@
 import sys
 from fnmatch import fnmatchcase
 
+from asv_runner.console import get_answer_default
+
 from . import Command, util
-from .. import console
 from ..console import log
 from ..results import iter_results
 
@@ -92,7 +93,7 @@ def run(cls, conf, patterns, y=True):
             log.info(f"Removing {len(files_to_remove)} files")
 
         if not y:
-            do = console.get_answer_default("Perform operations", "n")
+            do = get_answer_default("Perform operations", "n")
             if len(do) and do.lower()[0] != 'y':
                 sys.exit(0)
 

asv/commands/show.py

@@ -3,14 +3,16 @@
 import math
 from collections import defaultdict
 
+from asv_runner.console import color_print
+
 from . import Command, common_args
 from ..benchmarks import Benchmarks
 from ..machine import iter_machine_files
 from ..results import iter_results_for_machine, iter_results_for_machine_and_hash
 from ..runner import format_benchmark_result
 from ..repo import get_repo, NoSuchNameError
 from ..util import load_json
-from ..console import log, color_print
+from ..console import log
 from ..environment import get_environments
 from .. import util