Upgrade hacking 1.x
Change-Id: Id54894246f3db134a3868609dbbaa60062a92c5e
This commit is contained in:
parent
4d860ff770
commit
aa3d3bbc66
@ -68,10 +68,7 @@ def main():
|
||||
|
||||
def cleanup_workdir():
|
||||
if args.cleanup:
|
||||
try:
|
||||
shutil.rmtree(workdir)
|
||||
except:
|
||||
pass
|
||||
shutil.rmtree(workdir, True)
|
||||
else:
|
||||
print('not cleaning up %s' % workdir)
|
||||
atexit.register(cleanup_workdir)
|
||||
|
@ -229,10 +229,7 @@ def main():
|
||||
|
||||
def cleanup_workdir():
|
||||
if args.cleanup:
|
||||
try:
|
||||
shutil.rmtree(workdir)
|
||||
except:
|
||||
pass
|
||||
shutil.rmtree(workdir, True)
|
||||
else:
|
||||
print('not cleaning up %s' % workdir)
|
||||
atexit.register(cleanup_workdir)
|
||||
|
@ -162,10 +162,7 @@ def main():
|
||||
|
||||
def cleanup_workdir():
|
||||
if args.cleanup:
|
||||
try:
|
||||
shutil.rmtree(workdir)
|
||||
except:
|
||||
pass
|
||||
shutil.rmtree(workdir, True)
|
||||
else:
|
||||
print('not cleaning up %s' % workdir)
|
||||
atexit.register(cleanup_workdir)
|
||||
|
@ -1211,10 +1211,7 @@ def main():
|
||||
|
||||
def cleanup_workdir():
|
||||
if args.cleanup:
|
||||
try:
|
||||
shutil.rmtree(workdir)
|
||||
except:
|
||||
pass
|
||||
shutil.rmtree(workdir, True)
|
||||
else:
|
||||
print('not cleaning up %s' % workdir)
|
||||
atexit.register(cleanup_workdir)
|
||||
|
@ -80,7 +80,7 @@ def _collapse_deliverable_history(name, info):
|
||||
parsed_vers = pbr.version.SemanticVersion.from_pip_string(
|
||||
str(r['version']))
|
||||
vers_tuple = parsed_vers.version_tuple()
|
||||
except:
|
||||
except Exception:
|
||||
# If we can't parse the version, it must be some sort
|
||||
# of made up legacy tag. Ignore the parse error
|
||||
# and include the value in our output.
|
||||
|
@ -21,9 +21,9 @@ import fixtures
|
||||
import mock
|
||||
from oslotest import base
|
||||
|
||||
from openstack_releases.cmds import validate
|
||||
from openstack_releases import defaults
|
||||
from openstack_releases import gitutils
|
||||
from openstack_releases.cmds import validate
|
||||
from openstack_releases import yamlutils
|
||||
|
||||
|
||||
|
@ -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>=1.0.0,<1.1.0
|
||||
|
||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||
python-subunit>=0.0.18 # Apache-2.0/BSD
|
||||
|
@ -140,10 +140,7 @@ def main():
|
||||
|
||||
def cleanup_workdir():
|
||||
if args.cleanup:
|
||||
try:
|
||||
shutil.rmtree(workdir)
|
||||
except:
|
||||
pass
|
||||
shutil.rmtree(workdir, True)
|
||||
atexit.register(cleanup_workdir)
|
||||
|
||||
branch_name = 'origin/stable/' + args.series
|
||||
|
@ -106,11 +106,8 @@ def main():
|
||||
|
||||
def cleanup_workdir():
|
||||
if args.cleanup:
|
||||
try:
|
||||
verbose('cleaning up temporary files in {}'.format(workdir))
|
||||
shutil.rmtree(workdir)
|
||||
except:
|
||||
pass
|
||||
verbose('cleaning up temporary files in {}'.format(workdir))
|
||||
shutil.rmtree(workdir, True)
|
||||
else:
|
||||
print('not cleaning up {}'.format(workdir))
|
||||
atexit.register(cleanup_workdir)
|
||||
|
3
tox.ini
3
tox.ini
@ -31,7 +31,6 @@ commands =
|
||||
{toxinidir}/tools/tox-log-command.sh list-changes {posargs}
|
||||
|
||||
[testenv:pep8]
|
||||
deps = flake8>=2.2.4,<=2.4.1
|
||||
commands = flake8
|
||||
|
||||
[testenv:bashate]
|
||||
@ -72,7 +71,7 @@ commands =
|
||||
# E501 skipped because some of the code files include templates
|
||||
# that end up quite wide
|
||||
show-source = True
|
||||
ignore = E123,E125,E501
|
||||
ignore = E123,E125,E501,H405
|
||||
builtins = _
|
||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,release-tag-*
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user