Skip to content

Commit a9a352c

Browse files
committed
fix isort
Change-Id: I3dbe8aff5703753b37a523f9f109d361f9d44d0a Reviewed-on: http://review.couchbase.org/c/perfrunner/+/145832 Tested-by: Build Bot <[email protected]> Reviewed-by: Korrigan Clark <[email protected]>
1 parent e4e9514 commit a9a352c

File tree

14 files changed

+37
-30
lines changed

14 files changed

+37
-30
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ clean:
2424

2525
pep8:
2626
${ENV}/bin/flake8 --statistics ${PYTHON_PROJECTS}
27-
${ENV}/bin/isort --quiet --check-only --recursive ${PYTHON_PROJECTS}
27+
${ENV}/bin/isort --quiet --check-only ${PYTHON_PROJECTS}
2828
${ENV}/bin/pydocstyle ${PYTHON_PROJECTS}
2929

3030
test:

cbagent/collectors/__init__.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
1-
from cbagent.collectors.collector import Collector
2-
31
from cbagent.collectors.active_tasks import ActiveTasks
42
from cbagent.collectors.analytics import AnalyticsStats
3+
from cbagent.collectors.collector import Collector
54
from cbagent.collectors.eventing_stats import (
65
EventingConsumerStats,
76
EventingPerHandlerStats,
87
EventingPerNodeStats,
98
EventingStats,
109
)
11-
from cbagent.collectors.fts_stats import (
12-
FTSCollector,
13-
ElasticStats,
14-
)
10+
from cbagent.collectors.fts_stats import ElasticStats, FTSCollector
1511
from cbagent.collectors.jts_stats import JTSCollector
1612
from cbagent.collectors.kvstore_stats import KVStoreStats
17-
from cbagent.collectors.latency import Latency, KVLatency, QueryLatency
13+
from cbagent.collectors.latency import KVLatency, Latency, QueryLatency
14+
from cbagent.collectors.n1ql_stats import N1QLStats
15+
from cbagent.collectors.ns_server import (
16+
NSServer,
17+
NSServerOverview,
18+
NSServerSystem,
19+
XdcrStats,
20+
)
1821
from cbagent.collectors.observe import (
1922
DurabilityLatency,
2023
ObserveIndexLatency,
2124
ObserveSecondaryIndexLatency,
2225
)
23-
from cbagent.collectors.n1ql_stats import N1QLStats
24-
from cbagent.collectors.ns_server import NSServer, NSServerOverview, NSServerSystem, XdcrStats
2526
from cbagent.collectors.secondary_debugstats import (
2627
SecondaryDebugStats,
2728
SecondaryDebugStatsBucket,
@@ -30,16 +31,18 @@
3031
from cbagent.collectors.secondary_latency import SecondaryLatencyStats
3132
from cbagent.collectors.secondary_stats import SecondaryStats
3233
from cbagent.collectors.secondary_storage_stats import SecondaryStorageStats
33-
from cbagent.collectors.secondary_storage_stats_mm import SecondaryStorageStatsMM
34+
from cbagent.collectors.secondary_storage_stats_mm import (
35+
SecondaryStorageStatsMM,
36+
)
3437
from cbagent.collectors.system import (
35-
Disk,
3638
IO,
39+
PS,
40+
VMSTAT,
41+
Disk,
3742
Memory,
3843
Net,
3944
PageCache,
40-
PS,
4145
Sysdig,
4246
TypePerf,
43-
VMSTAT,
4447
)
4548
from cbagent.collectors.xdcr_lag import XdcrLag

perfdaily/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from perfrunner.helpers.metrics import DailyMetricHelper
22
from perfrunner.helpers.reporter import DailyReporter
3-
from perfrunner.tests import PerfTest
43
from perfrunner.settings import ClusterSpec, TestConfig
4+
from perfrunner.tests import PerfTest
55

66

77
class DailyTest(PerfTest):

perfrunner/remote/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from glob import glob
33

44
from fabric.api import cd, get, run, settings, shell_env
5+
56
from logger import logger
67
from perfrunner.remote.context import all_clients, master_client
78
from perfrunner.settings import REPO

perfrunner/remote/linux.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from fabric.api import cd, get, put, quiet, run, settings
88
from fabric.exceptions import CommandTimeout, NetworkError
9+
910
from logger import logger
1011
from perfrunner.helpers.misc import uhex
1112
from perfrunner.remote import Remote

perfrunner/tests/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from typing import Callable, Iterable, List, Optional
55

66
from logger import logger
7-
87
from perfrunner.helpers import local
98
from perfrunner.helpers.cluster import ClusterManager
109
from perfrunner.helpers.memcached import MemcachedHelper
@@ -15,7 +14,7 @@
1514
from perfrunner.helpers.remote import RemoteHelper
1615
from perfrunner.helpers.reporter import ShowFastReporter
1716
from perfrunner.helpers.rest import RestHelper
18-
from perfrunner.helpers.worker import spring_task, WorkerManager
17+
from perfrunner.helpers.worker import WorkerManager, spring_task
1918
from perfrunner.settings import (
2019
ClusterSpec,
2120
PhaseSettings,

perfrunner/utils/fts/load_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def start_load(self):
133133

134134
class Datefacet:
135135
def __init__(self):
136-
from multiprocessing import Manager, Lock
136+
from multiprocessing import Lock, Manager
137137
self.cb = Bucket('couchbase://172.23.99.211/bucket-1', password="password")
138138
self.lock = Lock()
139139
self.dsize = 1000000

perfrunner/utils/fts/postgress_migration.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
from threading import Thread
1010

11+
import psycopg2
1112
from couchbase.bucket import Bucket
1213
from couchbase.exceptions import NotFoundError
1314

14-
import psycopg2
15-
1615

1716
def load_as_separate_docs(bucketname, count, limit):
1817
bucket_name = bucketname

perfrunner/workloads/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import pkg_resources
2+
23
from logger import logger
34

45

perfrunner/workloads/keyFragger.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,14 @@
5858

5959
if cb_version[0] == '2':
6060
from couchbase import FMT_BYTES
61-
from couchbase.exceptions import TimeoutError, TemporaryFailError
6261
from couchbase.cluster import Cluster, PasswordAuthenticator
62+
from couchbase.exceptions import TemporaryFailError, TimeoutError
6363
elif cb_version[0] == '3':
64+
from couchbase.cluster import Cluster, PasswordAuthenticator
65+
from couchbase.exceptions import \
66+
TemporaryFailException as TemporaryFailError
6467
from couchbase.exceptions import TimeoutException as TimeoutError
65-
from couchbase.exceptions import TemporaryFailException as TemporaryFailError
6668
from couchbase_core._libcouchbase import FMT_BYTES
67-
from couchbase.cluster import Cluster, PasswordAuthenticator
6869

6970
# Stored value overhead
7071
SV_SIZE = 56 + 2

0 commit comments

Comments
 (0)