aboutsummaryrefslogtreecommitdiff
path: root/python/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'python/tox.ini')
-rw-r--r--python/tox.ini9
1 files changed, 5 insertions, 4 deletions
diff --git a/python/tox.ini b/python/tox.ini
index a6352ef4..cf8d5401 100644
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -1,11 +1,10 @@
[tox]
envlist =
- # cpp implementation on py34 is currently broken due to
- # changes introduced by http://bugs.python.org/issue22079.
py{26,27,33,34}-{cpp,python}
[testenv]
usedevelop=true
+passenv = CC
setenv =
cpp: LD_LIBRARY_PATH={toxinidir}/../src/.libs
cpp: DYLD_LIBRARY_PATH={toxinidir}/../src/.libs
@@ -13,11 +12,13 @@ setenv =
commands =
python setup.py -q build_py
python: python setup.py -q build
- cpp: python setup.py -q build --cpp_implementation
+ cpp: python setup.py -q build --cpp_implementation --warnings_as_errors
python: python setup.py -q test -q
cpp: python setup.py -q test -q --cpp_implementation
+ python: python setup.py -q test_conformance
+ cpp: python setup.py -q test_conformance --cpp_implementation
deps =
# Keep this list of dependencies in sync with setup.py.
- six
+ six>=1.9
py26: ordereddict
py26: unittest2