Permalink
Browse files

Merge a985f65 into cd0b9ad

  • Loading branch information...
auvipy committed Feb 9, 2017
2 parents cd0b9ad + a985f65 commit 2cc1be04454ffd58050feab69aace400d6c8d399
Showing with 49 additions and 14 deletions.
  1. +32 −10 .travis.yml
  2. +17 −4 tox.ini
View
@@ -2,14 +2,40 @@ language: python
python:
- "2.7"
- "3.2"
- "3.3"
- "3.4"
- "3.5"
sudo: false
env:
- DJANGO="1.9.6"
- DJANGO="1.8.13"
- DJANGO=1.8
- DJANGO=1.9
- DJANGO=1.10
- DJANGO=1.11
- DJANGO=master
matrix:
fast_finish: true
include:
- python: "3.6"
env: DJANGO=master
- python: "3.6"
env: DJANGO=1.11
- python: "3.3"
env: DJANGO=1.8
- python: "2.7"
env: TOXENV="lint"
- python: "2.7"
env: TOXENV="docs"
exclude:
- python: "2.7"
env: DJANGO=master
- python: "3.4"
env: DJANGO=master
allow_failures:
- env: DJANGO=master
- env: DJANGO=1.11
install:
- pip install Django==$DJANGO
@@ -23,10 +49,6 @@ script: coverage run --source=vanilla manage.py test
after_success: coverage report; coveralls
matrix:
exclude:
- python: "3.2"
env: DJANGO="1.9.6"
- python: "3.3"
env: DJANGO="1.9.6"
notifications:
email: false
View
21 tox.ini
@@ -1,10 +1,23 @@
[tox]
envlist =
dj19-py{27,34,35},
dj18-py{27,32,33,34,35},
{py27,py33,py34,py35}-django18,
{py27,py34,py35}-django{19,110},
{py27,py34,py35,py36}-django111,
{py35,py36}-djangomaster
[travis:env]
DJANGO =
1.8: django18
1.9: django19
1.10: django110
1.11: django111
master: djangomaster
[testenv]
commands = {envpython} manage.py test
deps =
dj19: django>=1.9,<1.10
dj18: django>=1.8,<1.9
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
django111: Django>=1.11a1,<2.0
djangomaster: https://github.com/django/django/archive/master.tar.gz

0 comments on commit 2cc1be0

Please sign in to comment.