Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Travis and tox: add Django 1.7

fix_request_path_info
Diederik van der Boor 2014-09-22 15:01:03 +02:00
parent be54fd9085
commit 30eb88fbdb
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -8,6 +8,7 @@ env:
- DJANGO=django==1.4.5 - DJANGO=django==1.4.5
- DJANGO=django==1.5 - DJANGO=django==1.5
- DJANGO=django==1.6 - DJANGO=django==1.6
- DJANGO=django==1.7
#- DJANGO=https://github.com/django/django/archive/stable/1.6.x.zip #- DJANGO=https://github.com/django/django/archive/stable/1.6.x.zip
matrix: matrix:
@ -16,6 +17,8 @@ matrix:
env: DJANGO=django==1.4.5 env: DJANGO=django==1.4.5
- python: "3.2" - python: "3.2"
env: DJANGO=django==1.4.5 env: DJANGO=django==1.4.5
- python: "2.6"
env: DJANGO=django==1.7
install: install:
- pip install $DJANGO coverage==3.6 - pip install $DJANGO coverage==3.6

12
tox.ini
View File

@ -7,12 +7,14 @@ envlist=
py27-django14, py27-django14,
py27-django15, py27-django15,
py27-django16, py27-django16,
py27-django17,
py32-django15, py32-django15,
py32-django16, py32-django16,
py33-django15, py33-django15,
py33-django16, py33-django16,
py33-django17,
py33-django-dev, py33-django-dev,
docs, docs,
@ -53,6 +55,11 @@ basepython=python2.7
deps= deps=
django==1.6 django==1.6
[testenv:py27-django17]
basepython=python2.7
deps=
django==1.7
[testenv:py32-django15] [testenv:py32-django15]
basepython=python3.2 basepython=python3.2
deps= deps=
@ -73,6 +80,11 @@ basepython=python3.3
deps= deps=
django==1.6 django==1.6
[testenv:py33-django17]
basepython=python3.3
deps=
django==1.7
[testenv:py33-django-dev] [testenv:py33-django-dev]
basepython=python3.3 basepython=python3.3
deps= deps=