openstack/trove
Code Issues Proposed changes

Fix gate failure on gate-trove-pep8

Browse Source 
The gate-trove-pep8 job fails on Jenkins with the following error:

pkg_resources.VersionConflict:
(pbr 1.0.1 (/home/jenkins/workspace/gate-trove-pep8/
.tox/pep8/lib/python2.7/site-packages),
Requirement.parse('pbr<1.0,>=0.5.21'))

This is caused by the fact that pbr has now released 1.0.1 and
although most of the dependencies in Trove have switched to:

pbr>=0.11,<2.0

we are still using the hacking module from last year
(hacking>=0.8.0,<0.9), which has pbr pegged to <1.0

The hacking module needs to be updated and the new rules ignored.

The following rules are now ignored:

E111,E122,E123,E128,E251,E265,E713,F821,H105,H237,H238,H301,H305,H306,
H307,H402,H404,H405,H407,H501,H904

Change-Id: Ief129369bbffbaec7694e3f0d36668dde1772f05
Closes-Bug: #1458985
This commit is contained in:
Peter Stachowski 2015-05-26 19:33:57 +00:00
parent 593cd891d2
commit 4e3e0e83c6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-requirements.txt
View File

@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
# Hacking already pins down pep8, pyflakes and flake8 # Hacking already pins down pep8, pyflakes and flake8
hacking>=0.8.0,<0.9 hacking>=0.10.0,<0.11
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
oslosphinx>=2.5.0 # Apache-2.0 oslosphinx>=2.5.0 # Apache-2.0

2
tox.ini
View File

@ -43,7 +43,7 @@ commands = {posargs}
show-source = True show-source = True
# H301 and H306 are ignored on purpose. # H301 and H306 are ignored on purpose.
# The rest of the ignores are TODOs. # The rest of the ignores are TODOs.
ignore = F821,H301,H306,H404 ignore = E111,E122,E123,E128,E251,E265,E713,F821,H105,H237,H238,H301,H305,H306,H307,H402,H404,H405,H407,H501,H904
builtins = _ builtins = _
exclude=.venv,.tox,dist,doc,openstack,*egg,rsdns,tools,etc,build,*.po,*.pot exclude=.venv,.tox,dist,doc,openstack,*egg,rsdns,tools,etc,build,*.po,*.pot
filename=*.py,trove-* filename=*.py,trove-*