openstack/releases
Code Issues Proposed changes

Merge "Upgrade hacking 1.x"

Browse Source
This commit is contained in:
Zuul 2018-02-21 05:41:08 +00:00 committed by Gerrit Code Review
commit 4495c82e3c
10 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_releases/cmds/check_diff_start.py
View File

@ -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)

5
openstack_releases/cmds/list_changes.py
View File

@ -236,10 +236,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)

5
openstack_releases/cmds/new_release.py
View File

@ -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)

5
openstack_releases/cmds/validate.py
View File

@ -1263,10 +1263,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)

2
openstack_releases/deliverable.py
View File

@ -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.

2
openstack_releases/tests/test_validate.py
View File

@ -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
test-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<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

5
tools/discover_branch_points.py
View File

@ -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

7
tools/verify_branches_and_late_releases.py
View File

@ -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
View File

@ -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-*