Merge "Update hacking for Python3"

changes/85/718985/1 ussuri-em
Zuul 3 years ago committed by Gerrit Code Review
commit 621a392d32
  1. 4
      lower-constraints.txt
  2. 1
      masakariclient/shell.py
  3. 2
      test-requirements.txt
  4. 4
      tox.ini

@ -13,9 +13,7 @@ dogpile.cache==0.6.2
dulwich==0.15.0
extras==1.0.0
fixtures==3.0.0
flake8==2.5.5
future==0.16.0
hacking==0.12.0
imagesize==0.7.1
iso8601==0.1.11
Jinja2==2.10
@ -43,9 +41,7 @@ oslo.serialization==2.18.0
oslo.utils==3.33.0
oslotest==3.2.0
pbr==2.0.0
pep8==1.5.7
prettytable==0.7.2
pyflakes==0.8.1
Pygments==2.2.0
pyparsing==2.1.0
pyperclip==1.5.27

@ -204,5 +204,6 @@ def main(args=None):
print(encodeutils.safe_encode(six.text_type(e)), sys.stderr)
return 1
if __name__ == "__main__":
sys.exit(main())

@ -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.13.0,<0.14,>=0.12.0 # Apache-2.0
hacking>=3.0,<3.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT

@ -63,9 +63,9 @@ commands = oslo_debug_helper {posargs}
[flake8]
# E123, E125 skipped as they are invalid PEP-8.
# W504 line break after binary operator
show-source = True
ignore = E123,E125
ignore = E123,E125,W504
builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build

Loading…
Cancel
Save