From b4944889458f06b660b93ae4bf9b3a64116dcc0f Mon Sep 17 00:00:00 2001
From: "John L. Villalovos" <john.l.villalovos@intel.com>
Date: Mon, 27 Feb 2017 12:34:33 -0800
Subject: [PATCH] Use flake8-import-order

Use the flake8 plugin flake8-import-order to check import ordering. It can do
it automatically and don't need reviewers to check it.

Change-Id: Ief79a4696d7cd9b57e61a68e76bebb01027ed44c
---
 test-requirements.txt                             | 1 +
 tox.ini                                           | 1 +
 valence/config.py                                 | 1 +
 valence/tests/__init__.py                         | 1 +
 valence/tests/unit/api/test_app.py                | 4 ++--
 valence/tests/unit/controller/test_podmanagers.py | 3 ++-
 valence/tests/unit/db/test_db_api.py              | 2 +-
 valence/tests/unit/db/test_etcd_db.py             | 2 +-
 8 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 772adaa..7057ec8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,7 @@
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
 coverage>=3.6
+flake8-import-order==0.11 # LGPLv3
 freezegun>=0.3.6  # Apache-2.0
 python-subunit>=0.0.18
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
diff --git a/tox.ini b/tox.ini
index d703671..b313099 100644
--- a/tox.ini
+++ b/tox.ini
@@ -71,3 +71,4 @@ commands =
 show-source = True
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,node_modules
+import-order-style = pep8
diff --git a/valence/config.py b/valence/config.py
index b4e9c71..a631022 100644
--- a/valence/config.py
+++ b/valence/config.py
@@ -19,6 +19,7 @@
 
 
 import logging
+
 from six.moves import configparser
 
 
diff --git a/valence/tests/__init__.py b/valence/tests/__init__.py
index 47f4407..36f2a45 100644
--- a/valence/tests/__init__.py
+++ b/valence/tests/__init__.py
@@ -1,4 +1,5 @@
 from unittest import TestCase
+
 from valence.api.route import app
 
 
diff --git a/valence/tests/unit/api/test_app.py b/valence/tests/unit/api/test_app.py
index 484b005..d4d77dc 100644
--- a/valence/tests/unit/api/test_app.py
+++ b/valence/tests/unit/api/test_app.py
@@ -11,10 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
-
 import unittest
 
+import mock
+
 from valence.api import app
 
 
diff --git a/valence/tests/unit/controller/test_podmanagers.py b/valence/tests/unit/controller/test_podmanagers.py
index db22464..fd8a85e 100644
--- a/valence/tests/unit/controller/test_podmanagers.py
+++ b/valence/tests/unit/controller/test_podmanagers.py
@@ -11,9 +11,10 @@
 #    under the License.
 
 import copy
-import mock
 import unittest
 
+import mock
+
 from valence.common import constants
 from valence.common.exception import BadRequest
 from valence.controller import podmanagers
diff --git a/valence/tests/unit/db/test_db_api.py b/valence/tests/unit/db/test_db_api.py
index c6f3ad0..d562fc4 100644
--- a/valence/tests/unit/db/test_db_api.py
+++ b/valence/tests/unit/db/test_db_api.py
@@ -12,11 +12,11 @@
 #    under the License.
 
 import json
-import mock
 import unittest
 
 import etcd
 import freezegun
+import mock
 
 from valence.db import api as db_api
 from valence.tests.unit.db import utils
diff --git a/valence/tests/unit/db/test_etcd_db.py b/valence/tests/unit/db/test_etcd_db.py
index 74c449c..9794026 100644
--- a/valence/tests/unit/db/test_etcd_db.py
+++ b/valence/tests/unit/db/test_etcd_db.py
@@ -11,10 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import unittest
 
 import etcd
+import mock
 
 from valence.db import etcd_db