summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-02-15 22:29:28 +0000
committerGerrit Code Review <review@openstack.org>2018-02-15 22:29:28 +0000
commitf6dfa0528e6e77ea77dacda1193afb97b13bc6aa (patch)
treec15c465334fec36d68250e4a9481ba54a77eefd3
parentcc99aa90a3af8a950f709fb280cfe7d7bb31c818 (diff)
parent8bd6312ebc9c800680694c10a2b77fe7ba9b3c79 (diff)
Merge "Add pep8 import order validation"
-rw-r--r--keystoneauth1/identity/v3/tokenless_auth.py1
-rw-r--r--keystoneauth1/tests/unit/access/test_v3_access.py2
-rw-r--r--keystoneauth1/tests/unit/test_betamax_fixture.py3
-rw-r--r--keystoneauth1/tests/unit/test_betamax_hooks.py3
-rw-r--r--keystoneauth1/tests/unit/test_discovery.py2
-rw-r--r--test-requirements.txt1
-rw-r--r--tox.ini2
7 files changed, 9 insertions, 5 deletions
diff --git a/keystoneauth1/identity/v3/tokenless_auth.py b/keystoneauth1/identity/v3/tokenless_auth.py
index 0e7e7f7..f1b3c7a 100644
--- a/keystoneauth1/identity/v3/tokenless_auth.py
+++ b/keystoneauth1/identity/v3/tokenless_auth.py
@@ -11,6 +11,7 @@
11# under the License. 11# under the License.
12 12
13import abc 13import abc
14
14import six 15import six
15 16
16from keystoneauth1 import _utils as utils 17from keystoneauth1 import _utils as utils
diff --git a/keystoneauth1/tests/unit/access/test_v3_access.py b/keystoneauth1/tests/unit/access/test_v3_access.py
index 53fa94d..5c12263 100644
--- a/keystoneauth1/tests/unit/access/test_v3_access.py
+++ b/keystoneauth1/tests/unit/access/test_v3_access.py
@@ -10,9 +10,9 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13import datetime
13import uuid 14import uuid
14 15
15import datetime
16from oslo_utils import timeutils 16from oslo_utils import timeutils
17 17
18from keystoneauth1 import access 18from keystoneauth1 import access
diff --git a/keystoneauth1/tests/unit/test_betamax_fixture.py b/keystoneauth1/tests/unit/test_betamax_fixture.py
index b537821..8984dcd 100644
--- a/keystoneauth1/tests/unit/test_betamax_fixture.py
+++ b/keystoneauth1/tests/unit/test_betamax_fixture.py
@@ -10,11 +10,10 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13import testtools
14
15import betamax 13import betamax
16from betamax import exceptions 14from betamax import exceptions
17import mock 15import mock
16import testtools
18 17
19from keystoneauth1.fixture import keystoneauth_betamax 18from keystoneauth1.fixture import keystoneauth_betamax
20from keystoneauth1.fixture import serializer 19from keystoneauth1.fixture import serializer
diff --git a/keystoneauth1/tests/unit/test_betamax_hooks.py b/keystoneauth1/tests/unit/test_betamax_hooks.py
index 9eb78c6..038eb43 100644
--- a/keystoneauth1/tests/unit/test_betamax_hooks.py
+++ b/keystoneauth1/tests/unit/test_betamax_hooks.py
@@ -10,8 +10,9 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13import betamax
14import json 13import json
14
15import betamax
15import mock 16import mock
16from requests import models 17from requests import models
17import testtools 18import testtools
diff --git a/keystoneauth1/tests/unit/test_discovery.py b/keystoneauth1/tests/unit/test_discovery.py
index c7bab41..949746d 100644
--- a/keystoneauth1/tests/unit/test_discovery.py
+++ b/keystoneauth1/tests/unit/test_discovery.py
@@ -11,9 +11,9 @@
11# under the License. 11# under the License.
12 12
13import json 13import json
14import mock
15import re 14import re
16 15
16import mock
17from testtools import matchers 17from testtools import matchers
18 18
19from keystoneauth1 import adapter 19from keystoneauth1 import adapter
diff --git a/test-requirements.txt b/test-requirements.txt
index e042db5..be9735f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,6 +4,7 @@
4 4
5hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 5hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
6flake8-docstrings==0.2.1.post1 # MIT 6flake8-docstrings==0.2.1.post1 # MIT
7flake8-import-order
7 8
8bandit>=1.1.0 # Apache-2.0 9bandit>=1.1.0 # Apache-2.0
9coverage!=4.4,>=4.0 # Apache-2.0 10coverage!=4.4,>=4.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 6d9425a..da10d83 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,6 +61,8 @@ ignore = D100,D101,D102,D103,D104,D203
61enable-extensions=H106,H203 61enable-extensions=H106,H203
62show-source = True 62show-source = True
63exclude = .venv,.tox,dist,doc,*egg,build 63exclude = .venv,.tox,dist,doc,*egg,build
64import-order-style = pep8
65application-import-names = keystoneauth1
64 66
65[testenv:docs] 67[testenv:docs]
66deps = -r{toxinidir}/doc/requirements.txt 68deps = -r{toxinidir}/doc/requirements.txt