summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2012-11-19 19:31:12 -0600
committerChuck Short <chuck.short@canonical.com>2012-11-19 21:20:42 -0600
commit560e5cd84ef2c1a6427c78d35eedc66445e1f77f (patch)
treecf1795c332720b6ac07edf926c07d5c1757b50cf
parent98032e804aa442e1aad17723cab2ed163ee0c810 (diff)
downloadnova-560e5cd84ef2c1a6427c78d35eedc66445e1f77f.tar.gz
nova-560e5cd84ef2c1a6427c78d35eedc66445e1f77f.tar.xz
nova-560e5cd84ef2c1a6427c78d35eedc66445e1f77f.zip
Pin pep8 to 1.3.3
Apart of making pep8 version standard across all openstack projects. With this change we ignore E712 since it is normal to use "column == True" in sqlalchemy. Change-Id: I73a162847a79558cb158112878033edf18039805 Signed-off-by: Chuck Short <chuck.short@canonical.com>
-rwxr-xr-xrun_tests.sh2
-rw-r--r--tools/test-requires2
-rw-r--r--tox.ini6
3 files changed, 5 insertions, 5 deletions
diff --git a/run_tests.sh b/run_tests.sh
index dd1145d2c..5028adb0a 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -128,7 +128,7 @@ function run_pep8 {
srcfiles+=" setup.py"
# Until all these issues get fixed, ignore.
- ignore='--ignore=N4,E12,E711,E721'
+ ignore='--ignore=N4,E12,E711,E721,E712'
${wrapper} python tools/hacking.py ${ignore} ${srcfiles}
diff --git a/tools/test-requires b/tools/test-requires
index b3d4b5a22..8a97720fa 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -8,7 +8,7 @@ nose
testtools
openstack.nose_plugin>=0.7
nosehtmloutput
-pep8==1.2
+pep8==1.3.3
pylint==0.25.2
sphinx>=1.1.2
feedparser
diff --git a/tox.ini b/tox.ini
index 55ac0cd43..16959d621 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,11 +22,11 @@ sitepackages = True
downloadcache = ~/cache/pip
[testenv:pep8]
-deps=pep8==1.2
+deps=pep8==1.3.3
commands =
- python tools/hacking.py --ignore=N4,E12,E711,E721 --repeat --show-source \
+ python tools/hacking.py --ignore=N4,E12,E711,E721,E712 --repeat --show-source \
--exclude=.venv,.tox,dist,doc,*openstack/common*,*lib/python*,*egg .
- python tools/hacking.py --ignore=N4,E12,E711,E721 --repeat --show-source \
+ python tools/hacking.py --ignore=N4,E12,E711,E721,E712 --repeat --show-source \
--filename=nova* bin
[testenv:pylint]