From bca5bace0717aac6b60b49ce928d7b35b0b3cb96 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 27 Feb 2020 14:19:55 +0000 Subject: [PATCH] Switch to hacking 2.x This supports Python 3 goodness. Some additional tox and gitignore tweaks are included while we're here. Change-Id: Id1a7a90119be242486584a3b5d6939083bfac84d Signed-off-by: Stephen Finucane --- .gitignore | 2 ++ test-requirements.txt | 4 +--- tox.ini | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3d307b5..bc1141f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ build/ # pbr-generated stuff /AUTHORS /ChangeLog +/RELEASENOTES.rst +/releasenotes/notes/reno.cache diff --git a/test-requirements.txt b/test-requirements.txt index 2122e22..6349b14 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,10 +2,8 @@ # 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,<1.2.0 # Apache-2.0 - +hacking>=2.0.0,<2.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 -python-subunit>=1.0.0 # Apache-2.0/BSD oslotest>=3.2.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD diff --git a/tox.ini b/tox.ini index 8be9ae4..82f6ded 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] -minversion = 2.0 +minversion = 3.2 envlist = py37,pep8 +ignore_basepython_conflict = true [testenv] basepython = python3 -install_command = pip install {opts} {packages} whitelist_externals = rm deps = @@ -46,7 +46,9 @@ commands = oslo_debug_helper {posargs} [flake8] # E123, E125 skipped as they are invalid PEP-8. +# +# W504 skipped since you must choose either W503 or W504 (they conflict) show-source = True -ignore = E123,E125,H405 +ignore = E123,E125,H405,W504 builtins = _ exclude=.venv,.git,.tox,dist,*lib/python*,*egg,build