aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAymeric Augustin2013-10-16 21:58:11 +0200
committerAymeric Augustin2013-10-17 18:24:57 +0200
commit604499223d6a074141b8901a4fbf53b28fd17126 (patch)
tree77b21fb5792f7a53b254cfbfe60844cebacb9fbd
parenta295b02cb8c3b8685f6fe7880b9412566ba1d4f6 (diff)
downloaddjango-debug-toolbar-604499223d6a074141b8901a4fbf53b28fd17126.tar.bz2
Add Python 3 to tox configurations.
Tests are obviously failing at this point.
-rw-r--r--.travis.yml8
-rw-r--r--tox.ini12
2 files changed, 19 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 67b07a4..f1d2e29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,17 @@ language: python
python:
- "2.6"
- "2.7"
+ - "3.2"
+ - "3.3"
env:
- DJANGO_VERSION=1.4.8
- DJANGO_VERSION=1.5.4
+matrix:
+ exclude:
+ - python: "3.2"
+ env: DJANGO_VERSION=1.4.8
+ - python: "3.3"
+ env: DJANGO_VERSION=1.4.8
install:
- pip install Django==$DJANGO_VERSION
script: python setup.py test
diff --git a/tox.ini b/tox.ini
index 8e37e43..74765b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,9 @@ envlist =
py26-django14,
py27-django14,
py26-django15,
- py27-django15
+ py27-django15,
+ py32-django15,
+ py33-django15
[testenv]
commands = python runtests.py
@@ -23,3 +25,11 @@ deps = Django>=1.5,<1.6
[testenv:py27-django15]
basepython = python2.7
deps = Django>=1.5,<1.6
+
+[testenv:py32-django15]
+basepython = python3.2
+deps = Django>=1.5,<1.6
+
+[testenv:py33-django15]
+basepython = python3.3
+deps = Django>=1.5,<1.6