Merge pull request #214 from mcpeak/fix-flake8-import-order

Fix flake8 import orders

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+import-order-style = google

repokid/cli/dispatcher_cli.py

@@ -3,8 +3,7 @@
 import json
 
 from cloudaux.aws.sts import sts_conn
-from marshmallow import Schema, fields, post_load
-
+from marshmallow import fields, post_load, Schema
 from repokid import CONFIG
 import repokid.dispatcher
 import repokid.utils.dynamo as dynamo

repokid/cli/repokid_cli.py

@@ -40,7 +40,6 @@
 import json
 import pprint
 import re
-import requests
 import sys
 import time
 
@@ -50,19 +49,19 @@
 from cloudaux.aws.sts import sts_conn
 from docopt import docopt
 import import_string
-from tabulate import tabulate
-import tabview as t
-from tqdm import tqdm
-
-from repokid import LOGGER
-from repokid import CONFIG
-from repokid import _get_hooks
 from repokid import __version__ as __version__
-from repokid.role import Role, Roles
+from repokid import _get_hooks
+from repokid import CONFIG
+from repokid import LOGGER
 import repokid.hooks
+from repokid.role import Role, Roles
 from repokid.utils.dynamo import (dynamo_get_or_create_table, find_role_in_cache, get_role_data, role_ids_for_account,
                                   role_ids_for_all_accounts, set_role_data)
 import repokid.utils.roledata as roledata
+import requests
+from tabulate import tabulate
+import tabview as t
+from tqdm import tqdm
 
 
 # http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html

repokid/dispatcher/__init__.py

@@ -2,8 +2,8 @@
 import datetime
 import time
 
-from repokid import CONFIG
 from repokid import _get_hooks
+from repokid import CONFIG
 import repokid.cli.repokid_cli as cli
 import repokid.utils.dynamo as dynamo
 import repokid.utils.roledata as roledata

repokid/filters/age/__init__.py

@@ -1,8 +1,8 @@
 import datetime
-from dateutil.tz import tzlocal
 
-from repokid.cli.repokid_cli import Filter
+from dateutil.tz import tzlocal
 from repokid import LOGGER
+from repokid.cli.repokid_cli import Filter
 
 
 class AgeFilter(Filter):

repokid/filters/blacklist/__init__.py

@@ -3,9 +3,8 @@
 
 import botocore
 from cloudaux.aws.sts import boto3_cached_conn
-
-from repokid.cli.repokid_cli import Filter
 from repokid import LOGGER
+from repokid.cli.repokid_cli import Filter
 
 
 def get_blacklist_from_bucket(bucket_config):

repokid/tests/test_dispatcher_cli.py

@@ -1,9 +1,9 @@
 import copy
 import datetime
-from mock import call, patch
 
-import repokid.dispatcher as dispatcher
+from mock import call, patch
 import repokid.cli.dispatcher_cli as dispatcher_cli
+import repokid.dispatcher as dispatcher
 
 
 DYNAMO_TABLE = None

repokid/tests/test_hooks.py

@@ -1,7 +1,6 @@
 import pytest
-
-import repokid.hooks
 import repokid.cli.repokid_cli
+import repokid.hooks
 from repokid.tests.artifacts.hook import function_1, function_2
 
 

repokid/tests/test_repokid_cli.py

@@ -14,10 +14,9 @@
 import datetime
 import logging
 import time
-from mock import call, patch
 
 from dateutil.tz import tzlocal
-
+from mock import call, patch
 import repokid.cli.repokid_cli
 from repokid.role import Role, Roles
 import repokid.utils.roledata

repokid/tests/test_roledata.py

@@ -14,10 +14,9 @@
 import time
 
 from mock import patch
-
-import repokid.utils.roledata
 from repokid.role import Role
 from repokid.tests.test_repokid_cli import ROLE_POLICIES, ROLES
+import repokid.utils.roledata
 
 
 AARDVARK_DATA = {

repokid/utils/dynamo.py

@@ -5,7 +5,6 @@
 import boto3
 from botocore.exceptions import ClientError as BotoClientError
 from cloudaux.aws.sts import boto3_cached_conn as boto3_cached_conn
-
 from repokid import LOGGER as LOGGER
 
 # used as a placeholder for empty SID to work around this: https://github.com/aws/aws-sdk-js/issues/833

repokid/utils/roledata.py

@@ -14,17 +14,17 @@
 from collections import defaultdict
 import copy
 import datetime
-from dateutil.tz import tzlocal
 import time
 
-from policyuniverse import expand_policy, get_actions_from_statement, all_permissions
 
-from repokid.utils.dynamo import (add_to_end_of_list, get_role_data, role_ids_for_account, set_role_data,
-                                  store_initial_role_data)
+from dateutil.tz import tzlocal
+from policyuniverse import all_permissions, expand_policy, get_actions_from_statement
 from repokid import CONFIG as CONFIG
 from repokid import LOGGER as LOGGER
 import repokid.hooks
 from repokid.role import Role
+from repokid.utils.dynamo import (add_to_end_of_list, get_role_data, role_ids_for_account, set_role_data,
+                                  store_initial_role_data)
 
 BEGINNING_OF_2015_MILLI_EPOCH = 1420113600000
 IAM_ACCESS_ADVISOR_UNSUPPORTED_SERVICES = frozenset([''])
@@ -371,7 +371,7 @@ def _get_epoch_authenticated(service_authenticated):
 
     # we have an odd timestamp, try to check
     elif BEGINNING_OF_2015_MILLI_EPOCH < service_authenticated < (current_time * 1000):
-        return (service_authenticated/1000, True)
+        return (service_authenticated / 1000, True)
 
     elif (BEGINNING_OF_2015_MILLI_EPOCH / 1000) < service_authenticated < current_time:
         return (service_authenticated, True)

setup.py

@@ -11,9 +11,11 @@
 #     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #     See the License for the specific language governing permissions and
 #     limitations under the License.
-import re
+
 import ast
-from setuptools import setup, find_packages
+import re
+
+from setuptools import find_packages, setup
 
 with open('requirements.txt') as f:
     REQUIRED = f.read().splitlines()

test-requirements.txt

@@ -1,4 +1,5 @@
-flake8
+flake8==3.5.0
+flake8-import-order==0.18.1
 python-dateutil==2.6.0
 mock==2.0.0
 pytest==3.2.3