Add tox.ini file and flake8 ignores

Change-Id: I11c89c3902d974e94f4fee29211970546579f29e
This commit is contained in:
Monty Taylor 2013-07-17 11:43:32 -07:00
parent afad771fff
commit 546716c585
6 changed files with 58 additions and 15 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
docs/_build
build
dist
.tox

View File

@ -11,7 +11,7 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
import sys, os
import os
os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_auth.tests.settings'
@ -174,14 +174,14 @@ htmlhelp_basename = 'DjangoOpenStackAuthdoc'
# -- Options for LaTeX output --------------------------------------------------
latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',
# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',
# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',
# Additional stuff for the LaTeX preamble.
#'preamble': '',
# Additional stuff for the LaTeX preamble.
#'preamble': '',
}
# Grouping the document tree into LaTeX files. List of tuples

View File

@ -164,7 +164,8 @@ class KeystoneBackend(object):
"""
if user.is_anonymous() or obj is not None:
return set()
# TODO: Integrate policy-driven RBAC when supported by Keystone.
# TODO(gabrielhurley): Integrate policy-driven RBAC
# when supported by Keystone.
role_perms = set(["openstack.roles.%s" % role['name'].lower()
for role in user.roles])
service_perms = set(["openstack.services.%s" % service['type'].lower()

View File

@ -62,8 +62,8 @@ def generate_test_data():
'id': uuid.uuid4().hex
},
{
'url':'http://public.localhost:5000/v3',
'region':'RegionOne',
'url': 'http://public.localhost:5000/v3',
'region': 'RegionOne',
'interface': 'public',
'id': uuid.uuid4().hex
}
@ -129,9 +129,9 @@ def generate_test_data():
'id': uuid.uuid4().hex
},
{
'url':'http://nova-public.localhost:8774/v2.0/%s' \
'url': 'http://nova-public.localhost:8774/v2.0/%s' \
% (project_dict_1['id']),
'region':'RegionOne',
'region': 'RegionOne',
'interface': 'public',
'id': uuid.uuid4().hex
},
@ -150,9 +150,9 @@ def generate_test_data():
'id': uuid.uuid4().hex
},
{
'url':'http://nova2-public.localhost:8774/v2.0/%s' \
'url': 'http://nova2-public.localhost:8774/v2.0/%s' \
% (project_dict_1['id']),
'region':'RegionTwo',
'region': 'RegionTwo',
'interface': 'public',
'id': uuid.uuid4().hex
}

View File

@ -262,7 +262,7 @@ class User(AnonymousUser):
if service['type'] == 'identity':
continue
for endpoint in service['endpoints']:
if not endpoint['region'] in regions:
if endpoint['region'] not in regions:
regions.append(endpoint['region'])
return regions

41
tox.ini Normal file
View File

@ -0,0 +1,41 @@
[tox]
envlist = py26,py27,py27dj14,pep8,py33
[testenv]
setenv = VIRTUAL_ENV={envdir}
NOSE_WITH_OPENSTACK=1
NOSE_OPENSTACK_COLOR=1
NOSE_OPENSTACK_RED=0.05
NOSE_OPENSTACK_YELLOW=0.025
NOSE_OPENSTACK_SHOW_ELAPSED=1
deps = mox
commands = python setup.py test
[testenv:pep8]
commands = flake8
[testenv:venv]
commands = {posargs}
[tox:jenkins]
downloadcache = ~/cache/pip
[flake8]
builtins = _
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py
# E121 continuation line indentation is not a multiple of four
# E126 continuation line over-indented for hanging indent
# E127 continuation line over-indented for visual indent
# E128 continuation line under-indented for visual indent
# F401 '<smth>' imported but unused
# F403 'from <smth> import *' used; unable to detect undefined names
# F841 local variable '<smth>' is assigned to but never used
# F999 syntax error in doctest
# H201 no 'except:' at least use 'except Exception:'
# H302 import only modules.'from optparse import make_option' does not import a module
# H303 No wildcard (*) import.
# H304 No relative imports. 'from .views import IndexView' is a relative import
# H4xx docstrings
# H701 empty localization string
# H702 Formatting operation should be outside of localization method call
ignore = E121,E126,E127,E128,E501,E502,F403,F841,F999,H201,H301,H306,H302,H303,H304,H4,H701,H702