Merge branch 'master' of https://github.com/Pylons/pyramid into start_pep8

John Anderson

2015-03-06 50a8a077f403b89ff43ad745f101213c2cfeea8f

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
[easy_install]
zip_ok = false
 
[nosetests]
match=^test
where=pyramid
nocapture=1
 
[aliases]
dev = develop easy_install pyramid[testing]
docs = develop easy_install pyramid[docs]
 
[bdist_wheel]
universal = 1
 
[flake8]
ignore = E301,E302,E731,E261,E123,E121,E128,E129,E125,W291,E501,W293,E303,W391,E266,E231,E201,E202,E127,E262
exclude = pyramid/tests/,pyramid/compat.py,pyramid/resource.py
show-source = True