Tox: Set environment variables properly

dferrante · Mar 22, 2014 · 5254f9a · 5254f9a
1 parent 95cdbac
commit 5254f9a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,10 @@ env:
   global:
     PYTHONUNBUFFERED=yes
   matrix:
-    - TOXENV=2.6 
-    - TOXENV=2.7 
-    - TOXENV=3.3 
-    - TOXENV=3.4 
+    - TOXENV=2.6
+    - TOXENV=2.7
+    - TOXENV=3.3
+    - TOXENV=3.4
     - TOXENV=pypy
 before_install:
   - |
@@ -39,4 +39,4 @@ notifications:
     channels:
       - "chat.freenode.net#celery"
     on_success: always
-    on_failure: always
+    on_failure: always
diff --git a/tox.ini b/tox.ini
@@ -15,37 +15,42 @@ basepython = python3.4
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test3.txt
        -r{toxinidir}/requirements/test-ci.txt
+setenv = C_DEBUG_TEST = 1
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           C_DEBUG_TEST=1 nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
+           nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
 
 [testenv:3.3]
 basepython = python3.3
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test3.txt
        -r{toxinidir}/requirements/test-ci.txt
+setenv = C_DEBUG_TEST = 1
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           C_DEBUG_TEST=1 nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
+           nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
 
 [testenv:2.7]
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
        -r{toxinidir}/requirements/test-ci.txt
+setenv = C_DEBUG_TEST = 1
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           C_DEBUG_TEST=1 nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
+           nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
 
 [testenv:2.6]
 basepython = python2.6
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
        -r{toxinidir}/requirements/test-ci.txt
+setenv = C_DEBUG_TEST = 1
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           C_DEBUG_TEST=1 nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
+           nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
 
 [testenv:pypy]
 basepython = pypy
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
        -r{toxinidir}/requirements/test-ci.txt
+setenv = C_DEBUG_TEST = 1
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           C_DEBUG_TEST=1 nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
+           nosetests -xsv --with-coverage --cover-inclusive --cover-erase []