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

Update tox and travis settings for Django 1.10

fix_request_path_info
Diederik van der Boor 2016-08-05 17:23:28 +02:00
parent 1a998733e1
commit 16586f398c
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -15,6 +15,7 @@ env:
- DJANGO="Django>=1.7,<1.8" - DJANGO="Django>=1.7,<1.8"
- DJANGO="Django>=1.8,<1.9" - DJANGO="Django>=1.8,<1.9"
- DJANGO="Django>=1.9,<1.10" - DJANGO="Django>=1.9,<1.10"
- DJANGO="Django>=1.10,<1.11"
- DJANGO="https://github.com/django/django/tarball/master" - DJANGO="https://github.com/django/django/tarball/master"
matrix: matrix:
@ -32,16 +33,22 @@ matrix:
env: DJANGO="Django>=1.4,<1.5" env: DJANGO="Django>=1.4,<1.5"
- python: "3.4" - python: "3.4"
env: DJANGO="Django>=1.9,<1.10" env: DJANGO="Django>=1.9,<1.10"
- python: "3.4"
env: DJANGO="Django>=1.10,<1.11"
- python: "3.3" - python: "3.3"
env: DJANGO="Django>=1.4,<1.5" env: DJANGO="Django>=1.4,<1.5"
- python: "3.3" - python: "3.3"
env: DJANGO="Django>=1.9,<1.10" env: DJANGO="Django>=1.9,<1.10"
- python: "3.3"
env: DJANGO="Django>=1.10,<1.11"
- python: "3.2" - python: "3.2"
env: DJANGO="Django>=1.4,<1.5" env: DJANGO="Django>=1.4,<1.5"
- python: "3.2" - python: "3.2"
env: DJANGO="Django>=1.9,<1.10" env: DJANGO="Django>=1.9,<1.10"
- python: "3.2"
env: DJANGO="Django>=1.10,<1.11"
- python: "2.6" - python: "2.6"
env: DJANGO="Django>=1.7,<1.8" env: DJANGO="Django>=1.7,<1.8"
@ -49,6 +56,8 @@ matrix:
env: DJANGO="Django>=1.8,<1.9" env: DJANGO="Django>=1.8,<1.9"
- python: "2.6" - python: "2.6"
env: DJANGO="Django>=1.9,<1.10" env: DJANGO="Django>=1.9,<1.10"
- python: "2.6"
env: DJANGO="Django>=1.10,<1.11"
- python: "2.6" - python: "2.6"
env: DJANGO="https://github.com/django/django/tarball/master" env: DJANGO="https://github.com/django/django/tarball/master"
allow_failures: allow_failures:

7
tox.ini
View File

@ -1,11 +1,11 @@
[tox] [tox]
envlist= envlist=
py26-django{14,15,16}, py26-django{14,15,16},
py27-django{14,15,16,17,18,19}, py27-django{14,15,16,17,18,19,110},
py32-django{15,16,17,18}, py32-django{15,16,17,18},
py33-django{15,16,17,18}, py33-django{15,16,17,18},
py34-django{15,16,17,18,19}, py34-django{15,16,17,18,19,110},
py35-django{18,19} py35-django{18,19,110}
# py33-django-dev, # py33-django-dev,
docs, docs,
@ -17,6 +17,7 @@ deps =
django17: Django >= 1.7, < 1.8 django17: Django >= 1.7, < 1.8
django18: Django >= 1.8, < 1.9 django18: Django >= 1.8, < 1.9
django19: Django >= 1.9, < 1.10 django19: Django >= 1.9, < 1.10
django110: Django >= 1.10, < 1.11
django-dev: https://github.com/django/django/tarball/master django-dev: https://github.com/django/django/tarball/master
commands= commands=
python runtests.py python runtests.py