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 bec4d33c7b41d55f3245632df38691ff054e207b Author: Nicholas Nezis <[email protected]> AuthorDate: Fri Jan 31 08:31:26 2020 -0500 Some python cleanup --- heron/executor/src/python/heron_executor.py | 2 +- heron/instance/src/python/instance/st_heron_instance.py | 2 +- heron/instance/src/python/network/heron_client.py | 3 ++- heron/instance/src/python/network/st_stmgr_client.py | 1 - heron/instance/src/python/utils/metrics/py_metrics.py | 5 ++++- heron/proto/BUILD | 2 +- heron/tools/admin/src/python/standalone.py | 6 +++--- heron/tools/cli/src/python/update.py | 9 +++++---- heron/tools/cli/src/python/version.py | 6 +++--- heron/tools/common/src/python/access/query.py | 2 -- heron/tools/tracker/src/python/BUILD | 2 +- heron/tools/tracker/src/python/handlers/metadatahandler.py | 1 - heron/tools/tracker/src/python/topology.py | 3 ++- heron/tools/ui/src/python/handlers/topology.py | 5 +++-- heronpy/proto/BUILD | 4 ++-- scripts/packages/heronpy/requirements.txt | 2 +- 16 files changed, 29 insertions(+), 26 deletions(-) diff --git a/heron/executor/src/python/heron_executor.py b/heron/executor/src/python/heron_executor.py index c9d4501..db8dff0 100755 --- a/heron/executor/src/python/heron_executor.py +++ b/heron/executor/src/python/heron_executor.py @@ -34,10 +34,10 @@ import sys import stat import threading import time -import yaml import socket import traceback import itertools +import yaml from heron.common.src.python.utils import log from heron.common.src.python.utils import proc diff --git a/heron/instance/src/python/instance/st_heron_instance.py b/heron/instance/src/python/instance/st_heron_instance.py index 569e5aa..e790ae7 100644 --- a/heron/instance/src/python/instance/st_heron_instance.py +++ b/heron/instance/src/python/instance/st_heron_instance.py @@ -24,8 +24,8 @@ import collections import logging import os import resource -import traceback import signal +import traceback import yaml import heronpy.api.api_constants as api_constants diff --git a/heron/instance/src/python/network/heron_client.py b/heron/instance/src/python/network/heron_client.py index fa071d3..61eb99e 100644 --- a/heron/instance/src/python/network/heron_client.py +++ b/heron/instance/src/python/network/heron_client.py @@ -22,10 +22,11 @@ import asyncore import socket +import time import traceback + from abc import abstractmethod -import time from heron.common.src.python.utils.log import Log import heron.instance.src.python.utils.system_constants as constants from heron.instance.src.python.network import HeronProtocol, REQID, StatusCode, OutgoingPacket diff --git a/heron/instance/src/python/network/st_stmgr_client.py b/heron/instance/src/python/network/st_stmgr_client.py index 2e1bcb0..e2317e4 100644 --- a/heron/instance/src/python/network/st_stmgr_client.py +++ b/heron/instance/src/python/network/st_stmgr_client.py @@ -164,4 +164,3 @@ class SingleThreadStmgrClient(HeronClient): """Called when new NewInstanceAssignmentMessage arrives""" Log.debug("In handle_assignment_message() of STStmgrClient, Physical Plan: \n%s", str(pplan)) self.heron_instance_cls.handle_assignment_msg(pplan) - diff --git a/heron/instance/src/python/utils/metrics/py_metrics.py b/heron/instance/src/python/utils/metrics/py_metrics.py index 55636bd..96b095f 100644 --- a/heron/instance/src/python/utils/metrics/py_metrics.py +++ b/heron/instance/src/python/utils/metrics/py_metrics.py @@ -22,12 +22,15 @@ import gc import resource import traceback + from heronpy.api.metrics import AssignableMetrics -from .metrics_helper import BaseMetricsHelper + import heron.instance.src.python.utils.system_constants as constants from heron.instance.src.python.utils import system_config from heron.common.src.python.utils.log import Log +from .metrics_helper import BaseMetricsHelper + # pylint: disable=too-many-instance-attributes class PyMetrics(BaseMetricsHelper): """Helper class to collect PyHeron program metrics""" diff --git a/heron/proto/BUILD b/heron/proto/BUILD index e03f718..2262332 100644 --- a/heron/proto/BUILD +++ b/heron/proto/BUILD @@ -177,7 +177,7 @@ java_library( pex_library( name = "proto-py", reqs = [ - "protobuf==3.6.1", + "protobuf==3.8.0", "setuptools==18.0.1", ], deps = [ diff --git a/heron/tools/admin/src/python/standalone.py b/heron/tools/admin/src/python/standalone.py index 6caf196..b7afdff 100644 --- a/heron/tools/admin/src/python/standalone.py +++ b/heron/tools/admin/src/python/standalone.py @@ -26,14 +26,14 @@ import tempfile import tarfile import argparse import socket -import requests +import json import time +import requests import netifaces import yaml -import json from heron.common.src.python.utils.log import Log -from heron.tools.cli.src.python.result import SimpleResult, Status +from heron.tools.cli.src.python.result import SimpleResult, Status import heron.tools.cli.src.python.args as cli_args import heron.tools.common.src.python.utils.config as config diff --git a/heron/tools/cli/src/python/update.py b/heron/tools/cli/src/python/update.py index e499fb6..bc39c7b 100644 --- a/heron/tools/cli/src/python/update.py +++ b/heron/tools/cli/src/python/update.py @@ -19,6 +19,9 @@ # under the License. ''' update.py ''' +import argparse +import re + from heron.common.src.python.utils.log import Log from heron.tools.cli.src.python.result import SimpleResult, Status @@ -27,9 +30,6 @@ import heron.tools.cli.src.python.cli_helper as cli_helper import heron.tools.cli.src.python.jars as jars import heron.tools.common.src.python.utils.config as config -import argparse -import re - def create_parser(subparsers): """ Create the parse for the update command """ parser = subparsers.add_parser( @@ -173,7 +173,8 @@ def run(command, parser, cl_args, unknown_args): try: dict_extra_args = build_extra_args_dict(cl_args) except Exception as err: - return SimpleResult(Status.InvocationError, err.message) + return SimpleResult(Status.InvocationError, str(err)) + # return SimpleResult(Status.InvocationError, err.message) # Execute if cl_args['deploy_mode'] == config.SERVER_MODE: diff --git a/heron/tools/cli/src/python/version.py b/heron/tools/cli/src/python/version.py index 260f2ae..581a153 100644 --- a/heron/tools/cli/src/python/version.py +++ b/heron/tools/cli/src/python/version.py @@ -19,6 +19,9 @@ # under the License. ''' version.py ''' +import sys +import requests + from heron.common.src.python.utils.log import Log from heron.tools.cli.src.python.result import SimpleResult, Status import heron.tools.cli.src.python.args as cli_args @@ -26,9 +29,6 @@ import heron.tools.common.src.python.utils.config as config import heron.tools.cli.src.python.cdefs as cdefs import heron.tools.cli.src.python.rest as rest -import sys -import requests - def add_version_titles(parser): ''' :param parser: diff --git a/heron/tools/common/src/python/access/query.py b/heron/tools/common/src/python/access/query.py index d126a7b..b65dff6 100644 --- a/heron/tools/common/src/python/access/query.py +++ b/heron/tools/common/src/python/access/query.py @@ -20,7 +20,6 @@ ''' query.py ''' - class QueryHandler(object): ''' QueryHandler ''' @@ -64,4 +63,3 @@ class QueryHandler(object): :return: ''' pass - diff --git a/heron/tools/tracker/src/python/BUILD b/heron/tools/tracker/src/python/BUILD index bfe7319..197a4a9 100644 --- a/heron/tools/tracker/src/python/BUILD +++ b/heron/tools/tracker/src/python/BUILD @@ -7,7 +7,7 @@ pex_library( exclude = ["main.py"], ), reqs = [ - "protobuf==3.6.1", + "protobuf==3.8.0", "tornado==4.0.2", "future==0.18.2", ], diff --git a/heron/tools/tracker/src/python/handlers/metadatahandler.py b/heron/tools/tracker/src/python/handlers/metadatahandler.py index 4605c63..f143258 100644 --- a/heron/tools/tracker/src/python/handlers/metadatahandler.py +++ b/heron/tools/tracker/src/python/handlers/metadatahandler.py @@ -74,4 +74,3 @@ class MetaDataHandler(BaseHandler): Log.error("Exception when handling GET request '/topologies/metadata'") Log.debug(traceback.format_exc()) self.write_error_response(e) - diff --git a/heron/tools/tracker/src/python/topology.py b/heron/tools/tracker/src/python/topology.py index 2deef9e..0c55856 100644 --- a/heron/tools/tracker/src/python/topology.py +++ b/heron/tools/tracker/src/python/topology.py @@ -22,9 +22,10 @@ import traceback import uuid -from heronpy.api import api_constants from heron.common.src.python.utils.log import Log +from heronpy.api import api_constants + # pylint: disable=too-many-instance-attributes class Topology(object): """ diff --git a/heron/tools/ui/src/python/handlers/topology.py b/heron/tools/ui/src/python/handlers/topology.py index 51985fe..441a174 100644 --- a/heron/tools/ui/src/python/handlers/topology.py +++ b/heron/tools/ui/src/python/handlers/topology.py @@ -25,11 +25,12 @@ import tornado.escape import tornado.web import tornado.gen -from . import base -from . import common import heron.tools.common.src.python.access as access import heron.common.src.python.utils.log as log +from . import base +from . import common + Log = log.Log ################################################################################ diff --git a/heronpy/proto/BUILD b/heronpy/proto/BUILD index 2a383f2..e9c6354 100644 --- a/heronpy/proto/BUILD +++ b/heronpy/proto/BUILD @@ -25,7 +25,7 @@ pex_library( name = "proto-py", srcs = glob(["**/*.py"]), reqs = [ - "protobuf==3.6.1", + "protobuf==3.8.0", "setuptools==18.0.1", ], deps = [ @@ -48,7 +48,7 @@ pex_binary( name = "proto-py-package", srcs = glob(["**/*.py"]), reqs = [ - "protobuf==3.6.1", + "protobuf==3.8.0", "setuptools==18.0.1", ], deps = [ diff --git a/scripts/packages/heronpy/requirements.txt b/scripts/packages/heronpy/requirements.txt index 6e23522..323fb1e 100644 --- a/scripts/packages/heronpy/requirements.txt +++ b/scripts/packages/heronpy/requirements.txt @@ -1,2 +1,2 @@ -protobuf==3.4.0 +protobuf==3.8.0 six
