Enable pep8 checks

Update tox.ini to run flake8 for the pep8 environment, and fix the
python source files in the repository that need to be updated to pass
the tests.

Change-Id: Ib3a1d252de9a7f78705f200a1bdfe51c6b91af19
This commit is contained in:
Doug Hellmann 2015-01-14 14:59:08 -05:00
parent c3ea9bb9f2
commit 14b8759076
6 changed files with 31 additions and 21 deletions

View File

@ -26,7 +26,7 @@ from lazr.restfulclient.errors import BadRequest, ServerError
parser = argparse.ArgumentParser(description="Consolidate milestone pages"
" at release time")
parser.add_argument('project', help='project to act on')
parser.add_argument('series', help='series to handle')
parser.add_argument('series', help='series to handle')
parser.add_argument('release', help='release milestone')
parser.add_argument('--copytask', action='store_true',
help='Enable CopyTask mode')
@ -76,7 +76,8 @@ for milestone in seriesmilestones:
release_is_in_series = True
else:
if (args.project == "swift" and
not milestone.name.startswith(release.name+"-rc")):
not milestone.name.startswith(
release.name + "-rc")):
continue
milestones.insert(0, milestone)
print "Found",
@ -141,7 +142,8 @@ for milestone in milestones:
print
if failed:
print
print "Some bugs could not be automatically updated due to LP timeouts:"
print("Some bugs could not be automatically updated "
"due to LP timeouts:")
for bugid in failed:
print "http://bugs.launchpad.net/bugs/%d" % bugid
print

View File

@ -89,7 +89,7 @@ for projectname in config['projects']:
if m.startswith("rc"):
code_name = m.upper()
else:
code_name=series.name[0:1] + m
code_name = series.name[0:1] + m
series.newMilestone(name=series.name + "-" + m,
date_targeted=d or None,
code_name=code_name)

View File

@ -91,8 +91,10 @@ def apply_rules(new_version, existing_versions):
actual = same_minor[2] + 1
expected = new_version[2]
if expected != actual:
return ['new version %r increments patch version more than one over %r' %
(format_version(new_version), format_version(same_minor))]
return [
'new version %r increments patch version more than one over %r'
% (format_version(new_version), format_version(same_minor))
]
if same_major is not None and same_major != same_minor:
print('last version in major series %r' %
format_version(same_major))
@ -100,11 +102,16 @@ def apply_rules(new_version, existing_versions):
actual = same_major[1] + 1
expected = new_version[1]
if actual > expected:
return ['new version %r increments minor version more than one over %r' %
(format_version(new_version), format_version(same_major))]
return [
('new version %r increments minor '
'version more than one over %r') %
(format_version(new_version), format_version(same_major))
]
if new_version[2] != 0:
return ['new version %r increments minor version and patch version' %
format_version(new_version)]
return [
'new version %r increments minor version and patch version'
% format_version(new_version)
]
latest_version = existing_versions[-1]
if new_version[0] > latest_version[0]:
return ['%r is a major version increment over %r' %

View File

@ -36,15 +36,15 @@ CODENAMES = {
'2015.1': 'kilo',
}
PROJECTS = { }
PROJECTS = {}
PROJECTS['grizzly'] = [
'nova', 'glance', 'keystone', 'neutron', 'cinder', 'horizon'
'nova', 'glance', 'keystone', 'neutron', 'cinder', 'horizon'
]
PROJECTS['havana'] = [ 'heat', 'ceilometer' ]
PROJECTS['havana'] = ['heat', 'ceilometer']
PROJECTS['havana'].extend(PROJECTS['grizzly'])
PROJECTS['icehouse'] = [ 'trove' ]
PROJECTS['icehouse'] = ['trove']
PROJECTS['icehouse'].extend(PROJECTS['havana'])
PROJECTS['juno'] = [ 'sahara' ]
PROJECTS['juno'] = ['sahara']
PROJECTS['juno'].extend(PROJECTS['icehouse'])

View File

@ -61,11 +61,13 @@ class RulesTest(base.BaseTestCase):
('existing series, extra patch number',
{'new_version': [1, 1, 3],
'existing_versions': [[0, 1, 0], [1, 0, 0], [1, 1, 1]],
'expected': ["new version '1.1.3' increments patch version more than one over '1.1.1'"]}),
'expected': [("new version '1.1.3' increments patch version "
"more than one over '1.1.1'")]}),
('existing series, extra patch number in existing minor release',
{'new_version': [1, 1, 3],
'existing_versions': [[0, 1, 0], [1, 0, 0], [1, 1, 1], [1, 2, 0]],
'expected': ["new version '1.1.3' increments patch version more than one over '1.1.1'"]}),
'expected': [("new version '1.1.3' increments patch "
"version more than one over '1.1.1'")]}),
('next major number',
{'new_version': [2, 0, 0],
@ -85,8 +87,7 @@ class RulesTest(base.BaseTestCase):
[2013, '1b4'],
[2013, '1b5'],
['grizzly-eol'],
['havana-eol'],
],
['havana-eol']],
'expected': []}),
]

View File

@ -15,8 +15,8 @@ deps = -r{toxinidir}/requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}'
[testenv:pep8]
#deps = flake8
#commands = flake8
deps = flake8
commands = flake8
[testenv:venv]
#commands = {posargs}