Browse Source

Ooops. Correct the build matrix to have an entry for py3.2 and fix pypy entry.

Ionel Cristian Mărieș 11 years ago
parent
commit
c3067695da
2 changed files with 22 additions and 5 deletions
  1. 1 1
      .travis.yml
  2. 21 4
      tox.ini

+ 1 - 1
.travis.yml

@@ -18,6 +18,6 @@ before_install:
     uname -a
     lsb_release -a
     sudo pip install tox
-script: TOXENV=py$(echo $TRAVIS_PYTHON_VERSION | tr -d .) tox -v
+script: tox -v -e $TRAVIS_PYTHON_VERSION
 after_success:
   - .tox/$TRAVIS_PYTHON_VERSION-$DJANGO_VERSION/bin/coveralls

+ 21 - 4
tox.ini

@@ -1,11 +1,16 @@
 [tox]
-envlist = py26,py27,py33,pypy
+envlist =
+    2.6,
+    2.7,
+    3.2,
+    3.3,
+    pypy
 
 [testenv]
 sitepackages = False
 commands = nosetests
 
-[testenv:py33]
+[testenv:3.3]
 basepython = python3.3
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test3.txt
@@ -17,7 +22,19 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
                      --cover3-html-dir={toxinidir}/cover        \
                      --cover3-xml-file={toxinidir}/coverage.xml
 
-[testenv:py27]
+[testenv:3.2]
+basepython = python3.2
+deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/test3.txt
+       -r{toxinidir}/requirements/test-ci.txt
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
+           pip install anyjson
+           nosetests -vd celery.tests --with-xunit              \
+                     --xunit-file="{toxinidir}/nosetests.xml"   \
+                     --cover3-html-dir={toxinidir}/cover        \
+                     --cover3-xml-file={toxinidir}/coverage.xml
+
+[testenv:2.7]
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
@@ -30,7 +47,7 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
                      --cover3-html-dir={toxinidir}/cover        \
                      --cover3-xml-file={toxinidir}/coverage.xml
 
-[testenv:py26]
+[testenv:2.6]
 basepython = python2.6
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt