Repository: aurora Updated Branches: refs/heads/master 884581b9a -> 8e81f8cf4
Upgrade isort version, which is less verbose by default. Bugs closed: AURORA-1397 Reviewed at https://reviews.apache.org/r/36456/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/8e81f8cf Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/8e81f8cf Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/8e81f8cf Branch: refs/heads/master Commit: 8e81f8cf4d3bf2713af0ef378cff8cb71b8a2410 Parents: 884581b Author: Bill Farner <[email protected]> Authored: Tue Jul 14 10:57:46 2015 -0700 Committer: Bill Farner <[email protected]> Committed: Tue Jul 14 10:57:46 2015 -0700 ---------------------------------------------------------------------- build-support/python/isort | 2 +- build-support/python/isort-check | 2 +- src/main/python/apache/aurora/admin/admin.py | 4 ++-- src/main/python/apache/aurora/admin/host_maintenance.py | 2 +- src/main/python/apache/aurora/admin/maintenance.py | 8 ++++---- .../python/apache/aurora/client/api/scheduler_client.py | 6 +++--- src/main/python/apache/aurora/client/base.py | 2 +- src/main/python/apache/aurora/client/cli/context.py | 4 ++-- src/main/python/apache/aurora/client/cli/jobs.py | 4 ++-- src/main/python/apache/aurora/client/cli/sla.py | 2 +- src/main/python/apache/aurora/client/cli/task.py | 4 ++-- src/main/python/apache/aurora/client/cli/update.py | 4 ++-- src/main/python/apache/aurora/config/__init__.py | 2 +- .../python/apache/aurora/executor/aurora_executor.py | 2 +- src/main/python/apache/thermos/config/schema_helpers.py | 2 +- src/test/python/apache/aurora/admin/test_admin.py | 2 +- .../python/apache/aurora/client/api/test_quota_check.py | 2 +- src/test/python/apache/aurora/client/api/test_sla.py | 4 ++-- .../python/apache/aurora/client/cli/test_context.py | 2 +- src/test/python/apache/aurora/client/cli/test_create.py | 6 +++--- src/test/python/apache/aurora/client/cli/test_kill.py | 4 ++-- .../python/apache/aurora/client/cli/test_restart.py | 2 +- .../python/apache/aurora/client/cli/test_supdate.py | 4 ++-- src/test/python/apache/aurora/client/cli/test_update.py | 4 ++-- src/test/python/apache/aurora/client/cli/util.py | 2 +- .../apache/aurora/client/hooks/test_hooked_api.py | 2 +- src/test/python/apache/aurora/client/test_config.py | 2 +- .../python/apache/aurora/common/test_pex_version.py | 2 +- src/test/python/apache/aurora/common/test_transport.py | 2 +- .../executor/bin/test_thermos_executor_entry_point.py | 2 +- .../python/apache/aurora/executor/common/fixtures.py | 2 +- .../apache/aurora/executor/common/test_announcer.py | 6 +++--- .../apache/aurora/executor/common/test_task_info.py | 4 ++-- .../apache/aurora/executor/test_thermos_executor.py | 2 +- .../apache/aurora/executor/test_thermos_task_runner.py | 2 +- .../aurora/tools/test_thermos_observer_entry_point.py | 2 +- src/test/python/apache/thermos/config/test_schema.py | 12 ++++++------ 37 files changed, 61 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/build-support/python/isort ---------------------------------------------------------------------- diff --git a/build-support/python/isort b/build-support/python/isort index 44f9659..37e6cd2 100755 --- a/build-support/python/isort +++ b/build-support/python/isort @@ -16,7 +16,7 @@ set -e HERE=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd) -ISORT_VERSION=3.8.0 +ISORT_VERSION=4.0.0 if ! [ -f "$HERE/isort.venv/BOOTSTRAPPED" ] || \ [ x`cat "$HERE/isort.venv/BOOTSTRAPPED"` != x$ISORT_VERSION ]; then http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/build-support/python/isort-check ---------------------------------------------------------------------- diff --git a/build-support/python/isort-check b/build-support/python/isort-check index 646cbf0..a1bb94c 100755 --- a/build-support/python/isort-check +++ b/build-support/python/isort-check @@ -14,4 +14,4 @@ set -e HERE=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd) -$HERE/isort -ns __init__.py -rc $HERE/../../src -c +$HERE/isort -ns __init__.py -rc $HERE/../../src -c -df http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/admin/admin.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/admin/admin.py b/src/main/python/apache/aurora/admin/admin.py index d2f7bd1..b68f546 100644 --- a/src/main/python/apache/aurora/admin/admin.py +++ b/src/main/python/apache/aurora/admin/admin.py @@ -27,11 +27,11 @@ from apache.aurora.client.api import AuroraClientAPI from apache.aurora.client.api.sla import JobUpTimeLimit from apache.aurora.client.base import ( AURORA_ADMIN_USER_AGENT_NAME, + GROUPING_OPTION, check_and_log_response, combine_messages, die, get_grouping_or_die, - GROUPING_OPTION, requires ) from apache.aurora.common.aurora_job_key import AuroraJobKey @@ -40,8 +40,8 @@ from apache.aurora.common.shellify import shellify from .admin_util import ( FILENAME_OPTION, - format_sla_results, HOSTS_OPTION, + format_sla_results, parse_hostnames, parse_hostnames_optional, parse_sla_percentage, http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/admin/host_maintenance.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/admin/host_maintenance.py b/src/main/python/apache/aurora/admin/host_maintenance.py index c31e2a6..cfb13de 100644 --- a/src/main/python/apache/aurora/admin/host_maintenance.py +++ b/src/main/python/apache/aurora/admin/host_maintenance.py @@ -18,7 +18,7 @@ from twitter.common.quantity import Amount, Time from apache.aurora.admin.admin_util import format_sla_results, print_results from apache.aurora.client.api import AuroraClientAPI -from apache.aurora.client.base import check_and_log_response, DEFAULT_GROUPING, group_hosts +from apache.aurora.client.base import DEFAULT_GROUPING, check_and_log_response, group_hosts from gen.apache.aurora.api.ttypes import Hosts, MaintenanceMode http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/admin/maintenance.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/admin/maintenance.py b/src/main/python/apache/aurora/admin/maintenance.py index 27d63f2..6d94c92 100644 --- a/src/main/python/apache/aurora/admin/maintenance.py +++ b/src/main/python/apache/aurora/admin/maintenance.py @@ -14,7 +14,7 @@ from twitter.common import app, log -from apache.aurora.client.base import get_grouping_or_die, GROUPING_OPTION, requires +from apache.aurora.client.base import GROUPING_OPTION, get_grouping_or_die, requires from apache.aurora.common.clusters import CLUSTERS from .admin_util import ( @@ -23,11 +23,11 @@ from .admin_util import ( OVERRIDE_SLA_DURATION_OPTION, OVERRIDE_SLA_PERCENTAGE_OPTION, OVERRIDE_SLA_REASON_OPTION, + POST_DRAIN_SCRIPT_OPTION, + UNSAFE_SLA_HOSTS_FILE_OPTION, parse_and_validate_sla_overrides, parse_hostnames, - parse_script, - POST_DRAIN_SCRIPT_OPTION, - UNSAFE_SLA_HOSTS_FILE_OPTION + parse_script ) from .host_maintenance import HostMaintenance http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/client/api/scheduler_client.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/client/api/scheduler_client.py b/src/main/python/apache/aurora/client/api/scheduler_client.py index 2b8047c..b8361b8 100644 --- a/src/main/python/apache/aurora/client/api/scheduler_client.py +++ b/src/main/python/apache/aurora/client/api/scheduler_client.py @@ -21,15 +21,15 @@ from pystachio import Default, Integer, String from thrift.protocol import TJSONProtocol from thrift.transport import TTransport from twitter.common import log -from twitter.common.concurrent import deadline, Timeout +from twitter.common.concurrent import Timeout, deadline from twitter.common.quantity import Amount, Time from twitter.common.zookeeper.kazoo_client import TwitterKazooClient from twitter.common.zookeeper.serverset import ServerSet from apache.aurora.common.auth.auth_module_manager import ( + SessionKeyError, get_auth_handler, - make_session_key, - SessionKeyError + make_session_key ) from apache.aurora.common.cluster import Cluster from apache.aurora.common.transport import TRequestsTransport http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/client/base.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/client/base.py b/src/main/python/apache/aurora/client/base.py index df53b90..dee4c28 100644 --- a/src/main/python/apache/aurora/client/base.py +++ b/src/main/python/apache/aurora/client/base.py @@ -20,7 +20,7 @@ from urlparse import urljoin from twitter.common import log -from apache.aurora.common.pex_version import pex_version, UnknownVersion +from apache.aurora.common.pex_version import UnknownVersion, pex_version from gen.apache.aurora.api.ttypes import ResponseCode http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/client/cli/context.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/client/cli/context.py b/src/main/python/apache/aurora/client/cli/context.py index c850223..24a37ec 100644 --- a/src/main/python/apache/aurora/client/cli/context.py +++ b/src/main/python/apache/aurora/client/cli/context.py @@ -21,12 +21,12 @@ from fnmatch import fnmatch from apache.aurora.client.api import AuroraClientAPI, SchedulerProxy from apache.aurora.client.base import AURORA_V2_USER_AGENT_NAME, combine_messages from apache.aurora.client.cli import ( - Context, EXIT_API_ERROR, EXIT_AUTH_ERROR, EXIT_COMMAND_FAILURE, EXIT_INVALID_CONFIGURATION, - EXIT_INVALID_PARAMETER + EXIT_INVALID_PARAMETER, + Context ) from apache.aurora.client.config import get_config from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/client/cli/jobs.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/client/cli/jobs.py b/src/main/python/apache/aurora/client/cli/jobs.py index 5f60841..6f76181 100644 --- a/src/main/python/apache/aurora/client/cli/jobs.py +++ b/src/main/python/apache/aurora/client/cli/jobs.py @@ -48,7 +48,6 @@ from apache.aurora.client.cli.options import ( BATCH_OPTION, BIND_OPTION, BROWSER_OPTION, - CommandOption, CONFIG_ARGUMENT, CONFIG_OPTION, FORCE_OPTION, @@ -60,7 +59,8 @@ from apache.aurora.client.cli.options import ( MAX_TOTAL_FAILURES_OPTION, NO_BATCHING_OPTION, STRICT_OPTION, - WATCH_OPTION + WATCH_OPTION, + CommandOption ) from apache.aurora.common.aurora_job_key import AuroraJobKey http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/client/cli/sla.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/client/cli/sla.py b/src/main/python/apache/aurora/client/cli/sla.py index 0274988..4d0e214 100644 --- a/src/main/python/apache/aurora/client/cli/sla.py +++ b/src/main/python/apache/aurora/client/cli/sla.py @@ -17,8 +17,8 @@ from twitter.common.quantity import Time from apache.aurora.client.cli import EXIT_OK, Noun, Verb from apache.aurora.client.cli.context import AuroraCommandContext from apache.aurora.client.cli.options import ( - CommandOption, JOBSPEC_ARGUMENT, + CommandOption, parse_percentiles, parse_time_values ) http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/client/cli/task.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/client/cli/task.py b/src/main/python/apache/aurora/client/cli/task.py index b541d03..d1f2568 100644 --- a/src/main/python/apache/aurora/client/cli/task.py +++ b/src/main/python/apache/aurora/client/cli/task.py @@ -27,11 +27,11 @@ from apache.aurora.client.base import combine_messages from apache.aurora.client.cli import EXIT_INVALID_PARAMETER, EXIT_OK, Noun, Verb from apache.aurora.client.cli.context import AuroraCommandContext from apache.aurora.client.cli.options import ( - CommandOption, EXECUTOR_SANDBOX_OPTION, INSTANCES_SPEC_ARGUMENT, SSH_USER_OPTION, - TASK_INSTANCE_ARGUMENT + TASK_INSTANCE_ARGUMENT, + CommandOption ) from apache.aurora.common.clusters import CLUSTERS http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/client/cli/update.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/client/cli/update.py b/src/main/python/apache/aurora/client/cli/update.py index 70f6c69..2dcc8f3 100644 --- a/src/main/python/apache/aurora/client/cli/update.py +++ b/src/main/python/apache/aurora/client/cli/update.py @@ -36,14 +36,14 @@ from apache.aurora.client.cli.options import ( ALL_INSTANCES, BIND_OPTION, BROWSER_OPTION, - CommandOption, CONFIG_ARGUMENT, HEALTHCHECK_OPTION, INSTANCES_SPEC_ARGUMENT, JOBSPEC_ARGUMENT, JSON_READ_OPTION, JSON_WRITE_OPTION, - STRICT_OPTION + STRICT_OPTION, + CommandOption ) from apache.aurora.common.aurora_job_key import AuroraJobKey http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/config/__init__.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/config/__init__.py b/src/main/python/apache/aurora/config/__init__.py index d63177c..665e2cd 100644 --- a/src/main/python/apache/aurora/config/__init__.py +++ b/src/main/python/apache/aurora/config/__init__.py @@ -24,8 +24,8 @@ from apache.thermos.config.loader import ThermosTaskWrapper from .loader import AuroraConfigLoader from .port_resolver import PortResolver -from .thrift import convert as convert_thrift from .thrift import InvalidConfig as InvalidThriftConfig +from .thrift import convert as convert_thrift __all__ = ('AuroraConfig', 'PortResolver') http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/aurora/executor/aurora_executor.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/executor/aurora_executor.py b/src/main/python/apache/aurora/executor/aurora_executor.py index 7ad179e..96d7a33 100644 --- a/src/main/python/apache/aurora/executor/aurora_executor.py +++ b/src/main/python/apache/aurora/executor/aurora_executor.py @@ -18,7 +18,7 @@ import traceback from mesos.interface import mesos_pb2 from twitter.common import log -from twitter.common.concurrent import deadline, defer, Timeout +from twitter.common.concurrent import Timeout, deadline, defer from twitter.common.metrics import Observable from twitter.common.quantity import Amount, Time http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/main/python/apache/thermos/config/schema_helpers.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/thermos/config/schema_helpers.py b/src/main/python/apache/thermos/config/schema_helpers.py index d88792a..46394bb 100644 --- a/src/main/python/apache/thermos/config/schema_helpers.py +++ b/src/main/python/apache/thermos/config/schema_helpers.py @@ -21,7 +21,7 @@ import itertools from pystachio import Empty, List from twitter.common.lang import Compatibility -from .schema_base import Constraint, GB, Process, Resources, Task +from .schema_base import GB, Constraint, Process, Resources, Task __all__ = ( # shorthand for process ordering constraint http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/admin/test_admin.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/admin/test_admin.py b/src/test/python/apache/aurora/admin/test_admin.py index 4e34ef1..d793293 100644 --- a/src/test/python/apache/aurora/admin/test_admin.py +++ b/src/test/python/apache/aurora/admin/test_admin.py @@ -14,7 +14,7 @@ import contextlib -from mock import create_autospec, patch, PropertyMock +from mock import PropertyMock, create_autospec, patch from apache.aurora.admin.admin import get_locks, get_scheduler, increase_quota, query, set_quota from apache.aurora.client.api import AuroraClientAPI http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/client/api/test_quota_check.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/api/test_quota_check.py b/src/test/python/apache/aurora/client/api/test_quota_check.py index ddd9466..6c9bc37 100644 --- a/src/test/python/apache/aurora/client/api/test_quota_check.py +++ b/src/test/python/apache/aurora/client/api/test_quota_check.py @@ -17,7 +17,7 @@ from copy import deepcopy from mock import call, create_autospec, patch -from apache.aurora.client.api.quota_check import CapacityRequest, print_quota, QuotaCheck +from apache.aurora.client.api.quota_check import CapacityRequest, QuotaCheck, print_quota from ...api_util import SchedulerThriftApiSpec http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/client/api/test_sla.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/api/test_sla.py b/src/test/python/apache/aurora/client/api/test_sla.py index 22b9f99..674e7f8 100644 --- a/src/test/python/apache/aurora/client/api/test_sla.py +++ b/src/test/python/apache/aurora/client/api/test_sla.py @@ -16,10 +16,10 @@ import time import unittest from contextlib import contextmanager -from mock import call, Mock, patch +from mock import Mock, call, patch from apache.aurora.client.api.sla import JobUpTimeLimit, Sla, task_query -from apache.aurora.client.base import add_grouping, DEFAULT_GROUPING, remove_grouping +from apache.aurora.client.base import DEFAULT_GROUPING, add_grouping, remove_grouping from apache.aurora.common.aurora_job_key import AuroraJobKey from apache.aurora.common.cluster import Cluster http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/client/cli/test_context.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/cli/test_context.py b/src/test/python/apache/aurora/client/cli/test_context.py index 1a134a2..204ca09 100644 --- a/src/test/python/apache/aurora/client/cli/test_context.py +++ b/src/test/python/apache/aurora/client/cli/test_context.py @@ -15,7 +15,7 @@ import mock import pytest from apache.aurora.client.api import AuroraClientAPI, SchedulerProxy -from apache.aurora.client.cli import Context, EXIT_AUTH_ERROR +from apache.aurora.client.cli import EXIT_AUTH_ERROR, Context from apache.aurora.client.cli.context import AuroraCommandContext from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI from apache.aurora.common.aurora_job_key import AuroraJobKey http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/client/cli/test_create.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/cli/test_create.py b/src/test/python/apache/aurora/client/cli/test_create.py index 101a01d..69039b6 100644 --- a/src/test/python/apache/aurora/client/cli/test_create.py +++ b/src/test/python/apache/aurora/client/cli/test_create.py @@ -15,15 +15,15 @@ import contextlib import pytest -from mock import call, create_autospec, Mock, patch +from mock import Mock, call, create_autospec, patch from twitter.common.contextutil import temporary_file from apache.aurora.client.cli import ( - Context, EXIT_COMMAND_FAILURE, EXIT_INTERRUPTED, EXIT_INVALID_CONFIGURATION, - EXIT_OK + EXIT_OK, + Context ) from apache.aurora.client.cli.client import AuroraCommandLine from apache.aurora.client.cli.jobs import CreateJobCommand http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/client/cli/test_kill.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/cli/test_kill.py b/src/test/python/apache/aurora/client/cli/test_kill.py index 5eae70a..564ea44 100644 --- a/src/test/python/apache/aurora/client/cli/test_kill.py +++ b/src/test/python/apache/aurora/client/cli/test_kill.py @@ -16,13 +16,13 @@ import contextlib import unittest import pytest -from mock import call, Mock, patch +from mock import Mock, call, patch from apache.aurora.client.api.job_monitor import JobMonitor from apache.aurora.client.cli import Context from apache.aurora.client.cli.client import AuroraCommandLine from apache.aurora.client.cli.jobs import KillAllJobCommand, KillCommand -from apache.aurora.client.cli.options import parse_instances, TaskInstanceKey +from apache.aurora.client.cli.options import TaskInstanceKey, parse_instances from .util import AuroraClientCommandTest, FakeAuroraCommandContext, mock_verb_options http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/client/cli/test_restart.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/cli/test_restart.py b/src/test/python/apache/aurora/client/cli/test_restart.py index dc67cfe..2c51d54 100644 --- a/src/test/python/apache/aurora/client/cli/test_restart.py +++ b/src/test/python/apache/aurora/client/cli/test_restart.py @@ -20,7 +20,7 @@ from twitter.common.contextutil import temporary_file from apache.aurora.client.api import UpdaterConfig from apache.aurora.client.api.health_check import Retriable, StatusHealthCheck -from apache.aurora.client.cli import Context, EXIT_API_ERROR, EXIT_INVALID_PARAMETER +from apache.aurora.client.cli import EXIT_API_ERROR, EXIT_INVALID_PARAMETER, Context from apache.aurora.client.cli.client import AuroraCommandLine from apache.aurora.client.cli.jobs import RestartCommand from apache.aurora.client.cli.options import TaskInstanceKey http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/client/cli/test_supdate.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/cli/test_supdate.py b/src/test/python/apache/aurora/client/cli/test_supdate.py index c6b6ccc..2d7d496 100644 --- a/src/test/python/apache/aurora/client/cli/test_supdate.py +++ b/src/test/python/apache/aurora/client/cli/test_supdate.py @@ -16,10 +16,10 @@ import time import mock import pytest -from mock import ANY, call, create_autospec, Mock +from mock import ANY, Mock, call, create_autospec from pystachio import Empty -from apache.aurora.client.cli import Context, EXIT_API_ERROR, EXIT_INVALID_PARAMETER, EXIT_OK +from apache.aurora.client.cli import EXIT_API_ERROR, EXIT_INVALID_PARAMETER, EXIT_OK, Context from apache.aurora.client.cli.options import TaskInstanceKey from apache.aurora.client.cli.update import ( AbortUpdate, http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/client/cli/test_update.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/cli/test_update.py b/src/test/python/apache/aurora/client/cli/test_update.py index 22b2ca7..787396e 100644 --- a/src/test/python/apache/aurora/client/cli/test_update.py +++ b/src/test/python/apache/aurora/client/cli/test_update.py @@ -15,7 +15,7 @@ import contextlib import functools import pytest -from mock import call, create_autospec, Mock, patch +from mock import Mock, call, create_autospec, patch from pystachio import Empty from twitter.common.contextutil import temporary_file @@ -23,7 +23,7 @@ from apache.aurora.client.api.health_check import Retriable, StatusHealthCheck from apache.aurora.client.api.job_monitor import JobMonitor from apache.aurora.client.api.quota_check import QuotaCheck from apache.aurora.client.api.scheduler_mux import SchedulerMux -from apache.aurora.client.cli import Context, EXIT_INVALID_CONFIGURATION, EXIT_OK +from apache.aurora.client.cli import EXIT_INVALID_CONFIGURATION, EXIT_OK, Context from apache.aurora.client.cli.client import AuroraCommandLine from apache.aurora.client.cli.jobs import CLIENT_UPDATER_DEPRECATION, UpdateCommand from apache.aurora.client.cli.options import TaskInstanceKey http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/client/cli/util.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/cli/util.py b/src/test/python/apache/aurora/client/cli/util.py index d7d8873..b03148b 100644 --- a/src/test/python/apache/aurora/client/cli/util.py +++ b/src/test/python/apache/aurora/client/cli/util.py @@ -15,7 +15,7 @@ import textwrap import unittest -from mock import create_autospec, Mock, patch +from mock import Mock, create_autospec, patch from apache.aurora.client.cli.context import AuroraCommandContext from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/client/hooks/test_hooked_api.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/hooks/test_hooked_api.py b/src/test/python/apache/aurora/client/hooks/test_hooked_api.py index f92e715..4d8ebab 100644 --- a/src/test/python/apache/aurora/client/hooks/test_hooked_api.py +++ b/src/test/python/apache/aurora/client/hooks/test_hooked_api.py @@ -14,7 +14,7 @@ from inspect import getargspec -from mock import create_autospec, Mock +from mock import Mock, create_autospec from apache.aurora.client.api import AuroraClientAPI from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI, NonHookedAuroraClientAPI http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/client/test_config.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/test_config.py b/src/test/python/apache/aurora/client/test_config.py index 14a7435..986061b 100644 --- a/src/test/python/apache/aurora/client/test_config.py +++ b/src/test/python/apache/aurora/client/test_config.py @@ -23,10 +23,10 @@ from apache.aurora.client.config import get_config as get_aurora_config from apache.aurora.config import AuroraConfig from apache.aurora.config.loader import AuroraConfigLoader from apache.aurora.config.schema.base import ( + MB, Announcer, HealthCheckConfig, Job, - MB, Resources, Task, UpdateConfig http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/common/test_pex_version.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/common/test_pex_version.py b/src/test/python/apache/aurora/common/test_pex_version.py index 3e6e284..507301a 100644 --- a/src/test/python/apache/aurora/common/test_pex_version.py +++ b/src/test/python/apache/aurora/common/test_pex_version.py @@ -18,7 +18,7 @@ import mock import pytest from pex.pex import PexInfo -from apache.aurora.common.pex_version import pex_version, UnknownVersion +from apache.aurora.common.pex_version import UnknownVersion, pex_version SHA = 'foo' DATE = 'some-date' http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/common/test_transport.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/common/test_transport.py b/src/test/python/apache/aurora/common/test_transport.py index f307e8d..835bb3d 100644 --- a/src/test/python/apache/aurora/common/test_transport.py +++ b/src/test/python/apache/aurora/common/test_transport.py @@ -17,7 +17,7 @@ from threading import Thread import pytest import requests -from mock import ANY, call, create_autospec, Mock +from mock import ANY, Mock, call, create_autospec from requests import exceptions as request_exceptions from thrift.protocol import TJSONProtocol from thrift.server import THttpServer http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/executor/bin/test_thermos_executor_entry_point.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/executor/bin/test_thermos_executor_entry_point.py b/src/test/python/apache/aurora/executor/bin/test_thermos_executor_entry_point.py index ec5b3f9..e9f7851 100644 --- a/src/test/python/apache/aurora/executor/bin/test_thermos_executor_entry_point.py +++ b/src/test/python/apache/aurora/executor/bin/test_thermos_executor_entry_point.py @@ -14,7 +14,7 @@ import os import unittest -from mock import create_autospec, Mock, patch +from mock import Mock, create_autospec, patch from apache.aurora.executor.bin.thermos_executor_main import dump_runner_pex, initialize, proxy_main from apache.aurora.executor.common.path_detector import MesosPathDetector http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/executor/common/fixtures.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/executor/common/fixtures.py b/src/test/python/apache/aurora/executor/common/fixtures.py index ebcbefa..3f31747 100644 --- a/src/test/python/apache/aurora/executor/common/fixtures.py +++ b/src/test/python/apache/aurora/executor/common/fixtures.py @@ -15,8 +15,8 @@ import getpass from apache.aurora.config.schema.base import ( - DefaultLifecycleConfig, MB, + DefaultLifecycleConfig, MesosJob, MesosTaskInstance, Process, http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/executor/common/test_announcer.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/executor/common/test_announcer.py b/src/test/python/apache/aurora/executor/common/test_announcer.py index f614f2c..46ad784 100644 --- a/src/test/python/apache/aurora/executor/common/test_announcer.py +++ b/src/test/python/apache/aurora/executor/common/test_announcer.py @@ -17,7 +17,7 @@ import threading import pytest from kazoo.client import KazooClient from kazoo.exceptions import KazooException -from mock import create_autospec, MagicMock, patch +from mock import MagicMock, create_autospec, patch from twitter.common.quantity import Amount, Time from twitter.common.testing.clock import ThreadedClock from twitter.common.zookeeper.serverset import Endpoint, ServerSet @@ -26,8 +26,8 @@ from apache.aurora.config.schema.base import HealthCheckConfig from apache.aurora.executor.common.announcer import ( Announcer, DefaultAnnouncerCheckerProvider, - make_endpoints, - ServerSetJoinThread + ServerSetJoinThread, + make_endpoints ) http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/executor/common/test_task_info.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/executor/common/test_task_info.py b/src/test/python/apache/aurora/executor/common/test_task_info.py index 29da828..0d9cc5c 100644 --- a/src/test/python/apache/aurora/executor/common/test_task_info.py +++ b/src/test/python/apache/aurora/executor/common/test_task_info.py @@ -16,9 +16,9 @@ import pytest from apache.aurora.config.schema.base import Process from apache.aurora.executor.common.task_info import ( - mesos_task_instance_from_assigned_task, TaskInfoError, - UnexpectedUnboundRefsError + UnexpectedUnboundRefsError, + mesos_task_instance_from_assigned_task ) from .fixtures import ( http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/executor/test_thermos_executor.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/executor/test_thermos_executor.py b/src/test/python/apache/aurora/executor/test_thermos_executor.py index 26b26f4..c3baa9f 100644 --- a/src/test/python/apache/aurora/executor/test_thermos_executor.py +++ b/src/test/python/apache/aurora/executor/test_thermos_executor.py @@ -34,8 +34,8 @@ from twitter.common.log.options import LogOptions from twitter.common.quantity import Amount, Time from apache.aurora.config.schema.base import ( - HealthCheckConfig, MB, + HealthCheckConfig, MesosJob, MesosTaskInstance, Process, http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/executor/test_thermos_task_runner.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/executor/test_thermos_task_runner.py b/src/test/python/apache/aurora/executor/test_thermos_task_runner.py index 3909aa2..cc32656 100644 --- a/src/test/python/apache/aurora/executor/test_thermos_task_runner.py +++ b/src/test/python/apache/aurora/executor/test_thermos_task_runner.py @@ -23,7 +23,7 @@ import time import pytest from mesos.interface import mesos_pb2 -from mock import call, Mock, patch +from mock import Mock, call, patch from twitter.common import log from twitter.common.contextutil import temporary_dir from twitter.common.dirutil import safe_rmtree http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/aurora/tools/test_thermos_observer_entry_point.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/tools/test_thermos_observer_entry_point.py b/src/test/python/apache/aurora/tools/test_thermos_observer_entry_point.py index e485b81..e1c8dec 100644 --- a/src/test/python/apache/aurora/tools/test_thermos_observer_entry_point.py +++ b/src/test/python/apache/aurora/tools/test_thermos_observer_entry_point.py @@ -14,7 +14,7 @@ import os import unittest -from mock import create_autospec, Mock, patch +from mock import Mock, create_autospec, patch from twitter.common.quantity import Amount, Time from apache.aurora.tools.thermos_observer import initialize http://git-wip-us.apache.org/repos/asf/aurora/blob/8e81f8cf/src/test/python/apache/thermos/config/test_schema.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/thermos/config/test_schema.py b/src/test/python/apache/thermos/config/test_schema.py index 7e18674..0440ee5 100644 --- a/src/test/python/apache/thermos/config/test_schema.py +++ b/src/test/python/apache/thermos/config/test_schema.py @@ -16,19 +16,19 @@ import pytest from twitter.common.collections import OrderedDict from apache.thermos.config.schema import ( - combine_tasks, - concat_tasks, Constraint, - java_options, - order, Process, - python_options, Resources, SequentialTask, SimpleTask, Task, Tasks, - Units + Units, + combine_tasks, + concat_tasks, + java_options, + order, + python_options )
