summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-03-30 18:44:45 +0000
committerGerrit Code Review <review@openstack.org>2020-03-30 18:44:45 +0000
commit2ff74894c81cdc266c97d3aa99b055193cc3ee2b (patch)
tree2c42649727d978f798941421f9d3f03e99183f7b
parentf88d07f9539990c9c55c8b1ffdd9727ae1ac1369 (diff)
parentf32fcc6623ccaf4c465700c23fa20f66c5c79daf (diff)
downloadkeystonemiddleware-2ff74894c81cdc266c97d3aa99b055193cc3ee2b.tar.gz
Merge "Update hacking for Python3"ussuri-em9.0.0
-rw-r--r--keystonemiddleware/auth_token/__init__.py2
-rw-r--r--keystonemiddleware/tests/unit/utils.py2
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini4
4 files changed, 6 insertions, 4 deletions
diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py
index d961f59..0feed6f 100644
--- a/keystonemiddleware/auth_token/__init__.py
+++ b/keystonemiddleware/auth_token/__init__.py
@@ -822,7 +822,7 @@ class AuthProtocol(BaseAuthProtocol):
plugin_opts = loading.get_auth_plugin_conf_options(plugin_loader)
self._conf.oslo_conf_obj.register_opts(plugin_opts, group=group)
- getter = lambda opt: self._conf.get(opt.dest, group=group)
+ getter = lambda opt: self._conf.get(opt.dest, group=group) # noqa
return plugin_loader.load_from_options_getter(getter)
def _create_session(self, **kwargs):
diff --git a/keystonemiddleware/tests/unit/utils.py b/keystonemiddleware/tests/unit/utils.py
index 6a07ec1..8b0944f 100644
--- a/keystonemiddleware/tests/unit/utils.py
+++ b/keystonemiddleware/tests/unit/utils.py
@@ -82,7 +82,7 @@ if tuple(sys.version_info)[0:2] < (2, 7):
class MiddlewareTestCase(BaseTestCase):
def create_middleware(self, cb, **kwargs):
- raise NotImplemented("implement this in your tests")
+ raise NotImplementedError("implement this in your tests")
def create_simple_middleware(self,
status='200 OK',
diff --git a/test-requirements.txt b/test-requirements.txt
index 6ca0c43..3ab58aa 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking<0.11,>=0.10.0
+hacking>=3.0,<4.0.0 # Apache-2.0
flake8-docstrings==0.2.1.post1 # MIT
coverage!=4.4,>=4.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index a576bb6..4023606 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,7 +50,9 @@ commands = oslo_debug_helper -t keystonemiddleware/tests {posargs}
# D103: Missing docstring in public function
# D104: Missing docstring in public package
# D203: 1 blank line required before class docstring (deprecated in pep257)
-ignore = D100,D101,D102,D103,D104,D203
+# W503 line break before binary operator
+# W504 line break after binary operator
+ignore = D100,D101,D102,D103,D104,D203,W503,W504
show-source = True
exclude = .venv,.tox,dist,doc,*egg,build