[click_helper] Moved out of scripts and update all import statements

beat/cmdline/algorithms.py

@@ -31,7 +31,6 @@ import os
 import simplejson as json
 
 
-from beat.cmdline.scripts.click_helper import AliasedGroup
 from beat.core import algorithm
 from beat.core.execution import DockerExecutor
 from beat.core.dock import Host
@@ -40,6 +39,8 @@ from beat.backend.python.algorithm import Storage as AlgorithmStorage
 
 from . import common
 from .decorators import raise_on_error
+from .click_helper import AliasedGroup
+
 
 logger = logging.getLogger(__name__)
 

beat/cmdline/cache.py

@@ -32,12 +32,12 @@ import logging
 
 import simplejson
 
-from beat.cmdline.scripts.click_helper import AliasedGroup
 from beat.core.data import CachedDataSource, load_data_index
 from beat.core.utils import NumpyJSONEncoder
 
 from . import common
 from .decorators import raise_on_error
+from .click_helper import AliasedGroup
 
 
 logger = logging.getLogger(__name__)

beat/cmdline/config.py

@@ -33,10 +33,12 @@ import copy
 import logging
 import getpass
 import click
-from .scripts.click_helper import AliasedGroup
-from .decorators import verbosity_option
 import simplejson
 
+from .decorators import verbosity_option
+from .click_helper import AliasedGroup
+
+
 logger = logging.getLogger(__name__)
 
 

beat/cmdline/databases.py

@@ -30,13 +30,9 @@ import click
 import glob
 import random
 import zmq
-
 import logging
-
-
 import simplejson
 
-from beat.cmdline.scripts.click_helper import AliasedGroup
 from beat.core.hash import toPath
 from beat.core.hash import hashDataset
 from beat.core.utils import NumpyJSONEncoder
@@ -48,9 +44,12 @@ from beat.core import utils
 
 from . import common
 from .decorators import raise_on_error
+from .click_helper import AliasedGroup
+
 
 logger = logging.getLogger(__name__)
 
+
 CMD_DB_INDEX = 'index'
 CMD_VIEW_OUTPUTS = 'databases_provider'
 

beat/cmdline/dataformats.py

@@ -32,12 +32,12 @@ import oset
 
 from beat.core import dataformat
 
-from beat.cmdline.scripts.click_helper import AliasedGroup
 
 from . import common
 from .decorators import raise_on_error
+from .click_helper import AliasedGroup
 
-LOGGER = logging.getLogger(__name__)
+logger = logging.getLogger(__name__)
 
 
 def pull_impl(webapi, prefix, names, force, indentation, cache):
@@ -104,7 +104,7 @@ def pull_impl(webapi, prefix, names, force, indentation, cache):
       dataformats |= obj.referenced.keys()
 
     except Exception as e:
-      LOGGER.error("loading `%s': %s...", name, str(e))
+      logger.error("loading `%s': %s...", name, str(e))
       cache[name] = None
 
   # recurse until done

beat/cmdline/experiments.py

@@ -33,9 +33,6 @@ import click
 import oset
 import simplejson
 
-from . import common
-
-from beat.cmdline.scripts.click_helper import AliasedGroup
 from beat.core.experiment import Experiment
 from beat.core.execution import DockerExecutor
 from beat.core.execution import LocalExecutor
@@ -45,9 +42,12 @@ from beat.core.dock import Host
 from beat.core.hash import toPath
 from beat.core.hash import hashDataset
 
+from . import common
 from .plotters import plot_impl as plotters_plot
 from .plotters import pull_impl as plotters_pull
 from .decorators import raise_on_error
+from .click_helper import AliasedGroup
+
 
 logger = logging.getLogger(__name__)
 

beat/cmdline/libraries.py

@@ -69,12 +69,12 @@ import logging
 import click
 import oset
 
-from beat.cmdline.scripts.click_helper import AliasedGroup
-
 from beat.core import library
 
 from . import common
 from .decorators import raise_on_error
+from .click_helper import AliasedGroup
+
 
 logger = logging.getLogger(__name__)
 

beat/cmdline/plotterparameters.py

@@ -26,14 +26,11 @@
 ###############################################################################
 
 import click
-
 import logging
 
-from beat.cmdline.scripts.click_helper import AliasedGroup
-
 from . import common
-
 from .decorators import raise_on_error
+from .click_helper import AliasedGroup
 
 
 logger = logging.getLogger(__name__)

beat/cmdline/plotters.py

@@ -35,8 +35,6 @@ import collections
 
 from PIL import Image
 
-from beat.cmdline.scripts.click_helper import AliasedGroup
-
 from beat.core import plotter
 from beat.core import dataformat
 
@@ -45,6 +43,8 @@ from .dataformats import pull_impl as dataformats_pull
 from .plotterparameters import pull_impl as plotterparameters_pull
 from .libraries import pull_impl as libraries_pull
 from .decorators import raise_on_error
+from .click_helper import AliasedGroup
+
 
 logger = logging.getLogger(__name__)
 

beat/cmdline/scripts/main_cli.py

@@ -5,7 +5,7 @@ import logging
 import pkg_resources
 import click
 from click_plugins import with_plugins
-from .click_helper import AliasedGroup
+from ..click_helper import AliasedGroup
 from ..decorators import verbosity_option
 from ..config import Configuration
 

beat/cmdline/toolchains.py

@@ -27,10 +27,9 @@
 
 import click
 
-from beat.cmdline.scripts.click_helper import AliasedGroup
-
 from . import common
 from .decorators import raise_on_error
+from .click_helper import AliasedGroup
 
 
 @click.group(cls=AliasedGroup)