Add django 2.0 to tests

fix_request_path_info
Charlie Denton 2017-10-29 00:18:05 +01:00
parent 96b11b50f9
commit 60e56ed472
No known key found for this signature in database
GPG Key ID: 5BBA1783DA191613
2 changed files with 16 additions and 3 deletions

View File

@ -7,12 +7,16 @@ python: "3.6"
env: env:
- TOXENV=py27-django111 - TOXENV=py27-django111
- TOXENV=py34-django111 - TOXENV=py34-django111
- TOXENV=py34-django200
- TOXENV=py35-django111 - TOXENV=py35-django111
- TOXENV=py35-django200
- TOXENV=py35-djangomaster - TOXENV=py35-djangomaster
- TOXENV=py36-django111 - TOXENV=py36-django111
- TOXENV=py36-django200
- TOXENV=py36-djangomaster - TOXENV=py36-djangomaster
# XXX: Use a matrix to build these? # XXX: Use a matrix to build these?
- TOXENV=py36-django111-postgres DB=postgres - TOXENV=py36-django111-postgres DB=postgres
- TOXENV=py36-django200-postgres DB=postgres
- TOXENV=py36-djangomaster-postgres DB=postgres - TOXENV=py36-djangomaster-postgres DB=postgres
services: services:
@ -21,13 +25,21 @@ services:
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
- python: "2.7"
env: TOXENV=py27-django111
- python: "3.5" - python: "3.5"
env: TOXENV=py35-django111 env: TOXENV=py35-django111
- python: "3.5"
env: TOXENV=py35-django200
- python: "3.5" - python: "3.5"
env: TOXENV=py35-djangomaster env: TOXENV=py35-djangomaster
exclude: exclude:
- python: "3.6"
env: TOXENV=py27-django111
- python: "3.6" - python: "3.6"
env: TOXENV=py35-django111 env: TOXENV=py35-django111
- python: "3.6"
env: TOXENV=py35-django200
- python: "3.6" - python: "3.6"
env: TOXENV=py35-djangomaster env: TOXENV=py35-djangomaster
allow_failures: allow_failures:

View File

@ -1,9 +1,9 @@
[tox] [tox]
envlist = envlist =
py27-django{111} py27-django{111}
py34-django{111} py34-django{111,200}
py35-django{111,master} py35-django{111,200,master}
py36-django{111,master} py36-django{111,200,master}
docs docs
[testenv] [testenv]
@ -15,6 +15,7 @@ deps =
coverage coverage
dj-database-url dj-database-url
django111: Django >= 1.11, < 2.0 django111: Django >= 1.11, < 2.0
django200: Django ~= 2.0.0
djangomaster: https://github.com/django/django/archive/master.tar.gz djangomaster: https://github.com/django/django/archive/master.tar.gz
postgres: psycopg2 postgres: psycopg2
commands = commands =