Browse Source

Fix pep8 gate running on py3.8

* Bumps hacking to 2.0.0 and addresses corresponding issues
* Bumps bandit to 1.6.2

Change-Id: I9d540acbd40700874b574687bc1fee4a9b5c0cb2
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
changes/51/754251/3
Andrii Ostapenko 7 months ago
parent
commit
9d07671866
No known key found for this signature in database GPG Key ID: F3E83668DBB223B3
7 changed files with 8 additions and 7 deletions
  1. +1
    -0
      alembic/env.py
  2. +2
    -2
      deckhand/barbican/driver.py
  3. +1
    -1
      deckhand/engine/revision_diff.py
  4. +1
    -1
      deckhand/tests/unit/common/test_utils.py
  5. +1
    -1
      requirements.txt
  6. +1
    -1
      test-requirements.txt
  7. +1
    -1
      tox.ini

+ 1
- 0
alembic/env.py View File

@ -89,6 +89,7 @@ def run_migrations_online():
with context.begin_transaction():
context.run_migrations()
if context.is_offline_mode():
run_migrations_offline()
else:


+ 2
- 2
deckhand/barbican/driver.py View File

@ -56,7 +56,7 @@ class BarbicanDriver(object):
'base64-encoding payload of type %s for '
'document [%s, %s] %s.', type(payload),
secret_doc.schema, secret_doc.layer, secret_doc.name)
secret_type = 'opaque'
secret_type = 'opaque' # nosec # not a hardcoded password
try:
payload = base64.encode_as_text(repr(payload))
except Exception:
@ -96,7 +96,7 @@ class BarbicanDriver(object):
.format((i + 1), CONF.secret_create_attempts))
try:
return self._do_create_secret(secret_args)
except Exception as e:
except Exception:
if i == (CONF.secret_create_attempts - 1):
# This was the last attempt, re-raise any error
raise


+ 1
- 1
deckhand/engine/revision_diff.py View File

@ -258,7 +258,7 @@ def _diff_buckets(b1, b2):
DeepDiff(d['metadata'],
b2_tmp[k]['metadata']).json)
except Exception as ex:
raise errors.DeepDiffException(details=str(ex))
raise errors.DeepDiffException(details=str(ex))
change_details.update({
str(k): {'data_changed': data_changed,


+ 1
- 1
deckhand/tests/unit/common/test_utils.py View File

@ -198,7 +198,7 @@ class TestJSONPathReplaceNegative(test_base.DeckhandTestCase):
error_re = (".*missing the pattern %s specified under .* at path %s.*")
self.assertRaisesRegex(errors.MissingDocumentPattern,
error_re % ("way invalid", "\$.path"),
error_re % ("way invalid", r"\$.path"),
utils.jsonpath_replace,
empty_body,
value="test",


+ 1
- 1
requirements.txt View File

@ -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==1.1.0
hacking==2.0.0
alembic==1.0.1
beaker==1.10.0


+ 1
- 1
test-requirements.txt View File

@ -9,7 +9,7 @@ python-subunit==1.3.0
os-testr==1.0.0
testrepository==0.0.20
testtools==2.3.0
bandit==1.5.1
bandit==1.6.2
# NOTE(felipemonteiro): Pin here because later versions require that
# content-type be present in empty responses.
gabbi==1.35.1


+ 1
- 1
tox.ini View File

@ -106,7 +106,7 @@ commands =
# [H904] Delay string interpolations at logging calls.
enable-extensions = H106,H203,H204,H205,H210,H904
# [E731] Do not assign a lambda expression, use a def. This reduces readability in some cases.
ignore = E731,H405
ignore = E731,F405,H405,W504
exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,releasenotes,doc,alembic/versions
[testenv:docs]


Loading…
Cancel
Save