Skip to content

Commit

Permalink
Added a test branch for py3.3. Queues does not support py3+ so it's g…
Browse files Browse the repository at this point in the history
…oing to fail.
  • Loading branch information
jefftriplett committed Aug 22, 2013
1 parent a6c02cf commit 27e91a4
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 4 deletions.
11 changes: 10 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: python
python:
- "2.6"
- "2.7"
- "3.3"

env:
- DJANGO=https://github.com/django/django/archive/master.tar.gz
Expand All @@ -11,7 +12,7 @@ env:
- DJANGO="django>=1.4,<1.5"

install:
- pip install $DJANGO
- pip install $DJANGO --use-mirrors
- pip install -r tests/requirements.txt --use-mirrors

script:
Expand All @@ -21,3 +22,11 @@ matrix:
exclude:
- python: "2.6"
env: DJANGO=https://github.com/django/django/archive/master.tar.gz
- python: "3.3"
env: DJANGO="django>=1.4,<1.5"
allow_failures:
- python: "3.3"
- env: DJANGO=https://github.com/django/django/archive/master.tar.gz
- env: DJANGO=https://github.com/django/django/archive/stable/1.6.x.tar.gz
- env: DJANGO="django>=1.5,<1.6"
- env: DJANGO="django>=1.4,<1.5"
18 changes: 15 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ envlist =
py27-django14,
py27-django15,
py27-django16,
py27-django-master
py27-django-master,
py33-django15,
py33-django16

[testenv]
deps=
Expand Down Expand Up @@ -80,8 +82,18 @@ deps =

[testenv:py33-django15]
basepython = python3.3
deps = {[django15]deps}
deps =
{[testenv]deps}
{[django15]deps}

[testenv:py33-django16]
basepython = python3.3
deps = {[django16]deps}
deps =
{[testenv]deps}
{[django16]deps}

[testenv:py33-django-master]
basepython = python3.3
deps =
{[testenv]deps}
{[django-master]deps}

0 comments on commit 27e91a4

Please sign in to comment.