diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-09 19:41:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-09 19:41:46 +0000 |
| commit | 7be39f19a0a022cc6ccca026fc9c64179f85d318 (patch) | |
| tree | 2f7512f0d6ab61d6c6589102f3e721003af751e5 | |
| parent | 22008a96fca32ccacde76a1efb602d79f8a9460e (diff) | |
| parent | 549616d12270a64548a907213c8e486bf0265dc8 (diff) | |
Merge "bug 968452"
| -rw-r--r-- | Authors | 1 | ||||
| -rwxr-xr-x | run_tests.sh | 18 | ||||
| -rw-r--r-- | tools/test-requires | 2 |
3 files changed, 4 insertions, 17 deletions
@@ -25,6 +25,7 @@ Bilal Akhtar <bilalakhtar@ubuntu.com> Brad Hall <brad@nicira.com> Brad McConnell <bmcconne@rackspace.com> Brendan Maguire <B_Maguire@Dell.com> +Brian Elliott <brian.elliott@rackspace.com> Brian Lamar <brian.lamar@rackspace.com> Brian Schott <bschott@isi.edu> Brian Waldon <brian.waldon@rackspace.com> diff --git a/run_tests.sh b/run_tests.sh index cf7e39f0e..37f286e3a 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -112,27 +112,13 @@ function run_pep8 { echo "Running pep8 ..." # Just run PEP8 in current environment # - # NOTE(sirp): W602 (deprecated 3-arg raise) is being ignored for the - # following reasons: - # - # 1. It's needed to preserve traceback information when re-raising - # exceptions; this is needed b/c Eventlet will clear exceptions when - # switching contexts. - # - # 2. There doesn't appear to be an alternative, "pep8-tool" compatible way of doing this - # in Python 2 (in Python 3 `with_traceback` could be used). - # - # 3. Can find no corroborating evidence that this is deprecated in Python 2 - # other than what the PEP8 tool claims. It is deprecated in Python 3, so, - # perhaps the mistake was thinking that the deprecation applied to Python 2 - # as well. - pep8_opts="--ignore=W602 --repeat" + pep8_opts="--repeat" ${wrapper} pep8 ${pep8_opts} ${srcfiles} } function run_hacking { echo "Running hacking compliance testing..." - hacking_opts="--ignore=E202,W602 --repeat" + hacking_opts="--ignore=E202 --repeat" ${wrapper} python tools/hacking.py ${hacking_opts} ${srcfiles} } diff --git a/tools/test-requires b/tools/test-requires index 2395e781a..84d41e7b2 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -6,5 +6,5 @@ mox==0.5.3 nose nosexcover openstack.nose_plugin -pep8==0.6.1 +pep8>=1.0 sphinx>=1.1.2 |