This is an automated email from the ASF dual-hosted git repository. nicknezis pushed a commit to branch nicknezis/bazel-2 in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit e3eb28b733f49f4dc307b9fe06984e17c84aa2f4 Author: Nicholas Nezis <[email protected]> AuthorDate: Sun Feb 2 13:26:09 2020 -0500 More pylint cleanup to make build pass --- examples/src/python/bolt/stateful_count_bolt.py | 1 + examples/src/python/bolt/stream_aggregate_bolt.py | 1 + examples/src/python/spout/multi_stream_spout.py | 1 + examples/src/python/spout/stateful_word_spout.py | 1 + examples/src/python/spout/word_spout.py | 1 + examples/src/python/stateful_word_count_topology.py | 1 + examples/src/python/window_size_topology.py | 2 ++ examples/src/python/word_count_topology.py | 1 + heron/instance/src/python/basics/base_instance.py | 12 +++++------- heron/instance/src/python/basics/bolt_instance.py | 11 ++++------- heron/instance/src/python/instance/st_heron_instance.py | 9 ++++----- heron/instance/src/python/network/event_looper.py | 1 + heron/instance/src/python/network/socket_options.py | 1 + heron/instance/src/python/utils/misc/pplan_helper.py | 6 +++--- heron/instance/src/python/utils/tuple.py | 1 + heron/instance/tests/python/utils/mock_generator.py | 1 + heron/shell/src/python/handlers/killexecutorhandler.py | 8 ++++---- .../integration_test/topology/all_grouping/all_grouping.py | 1 - 18 files changed, 33 insertions(+), 27 deletions(-) diff --git a/examples/src/python/bolt/stateful_count_bolt.py b/examples/src/python/bolt/stateful_count_bolt.py index a3ea6b6..260c0bf 100644 --- a/examples/src/python/bolt/stateful_count_bolt.py +++ b/examples/src/python/bolt/stateful_count_bolt.py @@ -20,6 +20,7 @@ """module for example bolt: CountBolt""" from collections import Counter + import heronpy.api.global_metrics as global_metrics from heronpy.api.bolt.bolt import Bolt from heronpy.api.state.stateful_component import StatefulComponent diff --git a/examples/src/python/bolt/stream_aggregate_bolt.py b/examples/src/python/bolt/stream_aggregate_bolt.py index 33b5d64..e94c3ca 100644 --- a/examples/src/python/bolt/stream_aggregate_bolt.py +++ b/examples/src/python/bolt/stream_aggregate_bolt.py @@ -20,6 +20,7 @@ '''stream aggregator''' from collections import Counter + from heronpy.api.bolt.bolt import Bolt # pylint: disable=unused-argument diff --git a/examples/src/python/spout/multi_stream_spout.py b/examples/src/python/spout/multi_stream_spout.py index 8a2cc18..b9e60a4 100644 --- a/examples/src/python/spout/multi_stream_spout.py +++ b/examples/src/python/spout/multi_stream_spout.py @@ -21,6 +21,7 @@ """Word spout with error streams""" from itertools import cycle + from heronpy.api.spout.spout import Spout from heronpy.api.stream import Stream diff --git a/examples/src/python/spout/stateful_word_spout.py b/examples/src/python/spout/stateful_word_spout.py index 9f368df..3a09777 100644 --- a/examples/src/python/spout/stateful_word_spout.py +++ b/examples/src/python/spout/stateful_word_spout.py @@ -22,6 +22,7 @@ from itertools import cycle from collections import Counter + from heronpy.api.spout.spout import Spout from heronpy.api.state.stateful_component import StatefulComponent diff --git a/examples/src/python/spout/word_spout.py b/examples/src/python/spout/word_spout.py index a194da3..d8a44c9 100644 --- a/examples/src/python/spout/word_spout.py +++ b/examples/src/python/spout/word_spout.py @@ -21,6 +21,7 @@ """module for example spout: WordSpout""" from itertools import cycle + from heronpy.api.spout.spout import Spout class WordSpout(Spout): diff --git a/examples/src/python/stateful_word_count_topology.py b/examples/src/python/stateful_word_count_topology.py index 1918dee..7068aa0 100644 --- a/examples/src/python/stateful_word_count_topology.py +++ b/examples/src/python/stateful_word_count_topology.py @@ -24,6 +24,7 @@ import sys import heronpy.api.api_constants as constants from heronpy.api.topology import TopologyBuilder from heronpy.api.stream import Grouping + from examples.src.python.spout import StatefulWordSpout from examples.src.python.bolt import StatefulCountBolt diff --git a/examples/src/python/window_size_topology.py b/examples/src/python/window_size_topology.py index d123199..3ef9409 100644 --- a/examples/src/python/window_size_topology.py +++ b/examples/src/python/window_size_topology.py @@ -25,7 +25,9 @@ import heronpy.api.api_constants as constants from heronpy.api.topology import TopologyBuilder from heronpy.api.stream import Grouping from heronpy.api.bolt.window_bolt import SlidingWindowBolt + from heron.examples.src.python.spout import WordSpout + from examples.src.python.bolt import WindowSizeBolt # Topology is defined using a topology builder diff --git a/examples/src/python/word_count_topology.py b/examples/src/python/word_count_topology.py index 0069b86..c849699 100644 --- a/examples/src/python/word_count_topology.py +++ b/examples/src/python/word_count_topology.py @@ -24,6 +24,7 @@ import sys import heronpy.api.api_constants as constants from heronpy.api.topology import TopologyBuilder from heronpy.api.stream import Grouping + from examples.src.python.spout import WordSpout from examples.src.python.bolt import CountBolt diff --git a/heron/instance/src/python/basics/base_instance.py b/heron/instance/src/python/basics/base_instance.py index 93ebed4..0a17520 100644 --- a/heron/instance/src/python/basics/base_instance.py +++ b/heron/instance/src/python/basics/base_instance.py @@ -22,23 +22,21 @@ import logging import traceback -from abc import abstractmethod -import heronpy.api.global_metrics as global_metrics -import heronpy.api.api_constants as api_constants -from heronpy.api.state.stateful_component import StatefulComponent +from abc import abstractmethod from heron.common.src.python.utils.log import Log - from heron.proto import tuple_pb2 - from heron.instance.src.python.utils.misc import SerializerHelper from heron.instance.src.python.utils.misc import OutgoingTupleHelper from heron.instance.src.python.utils import system_config - import heron.instance.src.python.utils.system_constants as system_constants import heron.common.src.python.pex_loader as pex_loader +import heronpy.api.global_metrics as global_metrics +import heronpy.api.api_constants as api_constants +from heronpy.api.state.stateful_component import StatefulComponent + # pylint: disable=too-many-instance-attributes class BaseInstance(object): """The base class for heron bolt/spout instance diff --git a/heron/instance/src/python/basics/bolt_instance.py b/heron/instance/src/python/basics/bolt_instance.py index 972baf0..3391513 100644 --- a/heron/instance/src/python/basics/bolt_instance.py +++ b/heron/instance/src/python/basics/bolt_instance.py @@ -23,19 +23,16 @@ import time import queue -import heronpy.api.api_constants as api_constants -from heronpy.api.state.stateful_component import StatefulComponent -from heronpy.api.stream import Stream - from heron.common.src.python.utils.log import Log - from heron.proto import topology_pb2, tuple_pb2, ckptmgr_pb2 - from heron.instance.src.python.utils.metrics import BoltMetrics from heron.instance.src.python.utils.tuple import TupleHelper, HeronTuple - import heron.instance.src.python.utils.system_constants as system_constants +import heronpy.api.api_constants as api_constants +from heronpy.api.state.stateful_component import StatefulComponent +from heronpy.api.stream import Stream + from .base_instance import BaseInstance class BoltInstance(BaseInstance): diff --git a/heron/instance/src/python/instance/st_heron_instance.py b/heron/instance/src/python/instance/st_heron_instance.py index e790ae7..eeed39e 100644 --- a/heron/instance/src/python/instance/st_heron_instance.py +++ b/heron/instance/src/python/instance/st_heron_instance.py @@ -26,12 +26,8 @@ import os import resource import signal import traceback -import yaml - -import heronpy.api.api_constants as api_constants -from heronpy.api.state.state import HashMapState - from heron.common.src.python.utils import log +import yaml from heron.proto import physical_plan_pb2, tuple_pb2, ckptmgr_pb2, common_pb2 @@ -46,6 +42,9 @@ from heron.instance.src.python.basics import SpoutInstance, BoltInstance import heron.instance.src.python.utils.system_constants as constants from heron.instance.src.python.utils import system_config +import heronpy.api.api_constants as api_constants +from heronpy.api.state.state import HashMapState + Log = log.Log AssignedInstance = collections.namedtuple('AssignedInstance', 'is_spout, protobuf, py_class') diff --git a/heron/instance/src/python/network/event_looper.py b/heron/instance/src/python/network/event_looper.py index a4ffe78..607de7e 100644 --- a/heron/instance/src/python/network/event_looper.py +++ b/heron/instance/src/python/network/event_looper.py @@ -25,6 +25,7 @@ import sys from abc import abstractmethod from heapq import heappush, heappop + from heron.common.src.python.utils.log import Log class EventLooper(object): diff --git a/heron/instance/src/python/network/socket_options.py b/heron/instance/src/python/network/socket_options.py index d66c758..7d93219 100644 --- a/heron/instance/src/python/network/socket_options.py +++ b/heron/instance/src/python/network/socket_options.py @@ -21,6 +21,7 @@ '''socket_options.py''' from collections import namedtuple + from heron.common.src.python.utils.log import Log import heron.instance.src.python.utils.system_constants as const from heron.instance.src.python.utils import system_config diff --git a/heron/instance/src/python/utils/misc/pplan_helper.py b/heron/instance/src/python/utils/misc/pplan_helper.py index e14c409..477aaa3 100644 --- a/heron/instance/src/python/utils/misc/pplan_helper.py +++ b/heron/instance/src/python/utils/misc/pplan_helper.py @@ -21,14 +21,14 @@ '''pplan_helper.py''' import socket -from heronpy.api.custom_grouping import ICustomGrouping -from heronpy.api.serializer import default_serializer from heron.proto import topology_pb2 from heron.common.src.python.utils.log import Log import heron.common.src.python.pex_loader as pex_loader - from heron.instance.src.python.utils.topology import TopologyContextImpl +from heronpy.api.custom_grouping import ICustomGrouping +from heronpy.api.serializer import default_serializer + from .custom_grouping_helper import CustomGroupingHelper # pylint: disable=too-many-instance-attributes diff --git a/heron/instance/src/python/utils/tuple.py b/heron/instance/src/python/utils/tuple.py index 789141c..129c16d 100644 --- a/heron/instance/src/python/utils/tuple.py +++ b/heron/instance/src/python/utils/tuple.py @@ -24,6 +24,7 @@ import time import random from collections import namedtuple + from heronpy.api.tuple import Tuple HeronTuple = namedtuple('Tuple', Tuple._fields + ('creation_time', 'roots')) diff --git a/heron/instance/tests/python/utils/mock_generator.py b/heron/instance/tests/python/utils/mock_generator.py index 8809096..0a4060b 100644 --- a/heron/instance/tests/python/utils/mock_generator.py +++ b/heron/instance/tests/python/utils/mock_generator.py @@ -29,6 +29,7 @@ from mock import patch from heronpy.api.task_hook import ITaskHook from heronpy.api.custom_grouping import ICustomGrouping from heronpy.api.serializer import PythonSerializer + from heron.instance.src.python.utils.metrics import MetricsCollector from heron.instance.src.python.utils.misc import (OutgoingTupleHelper, PhysicalPlanHelper, HeronCommunicator) diff --git a/heron/shell/src/python/handlers/killexecutorhandler.py b/heron/shell/src/python/handlers/killexecutorhandler.py index fb2e56d..0e24569 100644 --- a/heron/shell/src/python/handlers/killexecutorhandler.py +++ b/heron/shell/src/python/handlers/killexecutorhandler.py @@ -20,15 +20,15 @@ ''' killexecutorhandler.py ''' -from future.standard_library import install_aliases -install_aliases() - import logging import os import signal from urllib.parse import parse_qsl -import tornado.web +from future.standard_library import install_aliases +install_aliases() + +import tornado.web from tornado.options import options class KillExecutorHandler(tornado.web.RequestHandler): diff --git a/integration_test/src/python/integration_test/topology/all_grouping/all_grouping.py b/integration_test/src/python/integration_test/topology/all_grouping/all_grouping.py index 8febd7b..ba5e671 100644 --- a/integration_test/src/python/integration_test/topology/all_grouping/all_grouping.py +++ b/integration_test/src/python/integration_test/topology/all_grouping/all_grouping.py @@ -26,7 +26,6 @@ from integration_test.src.python.integration_test.core import TestTopologyBuilde from integration_test.src.python.integration_test.common.bolt import IdentityBolt from integration_test.src.python.integration_test.common.spout import ABSpout - def all_grouping_builder(topology_name, http_server_url): """Integration test topology builder for all grouping""" builder = TestTopologyBuilder(topology_name, http_server_url)
