Skip to content

Commit 8201b81

Browse files
committed
updated test matrix
1 parent 53b8015 commit 8201b81

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: python
2-
python: "2.7"
2+
python:
3+
- "3.5"
4+
35
sudo: false
46

57
env:
@@ -18,14 +20,10 @@ env:
1820
- TOX_ENV=docs
1921

2022
matrix:
21-
# Python 3.5 not yet available on travis, watch this to see when it is.
2223
fast_finish: true
23-
allow_failures:
24-
- env: TOX_ENV=py35-django18
25-
- env: TOX_ENV=py35-django19
2624

2725
install:
28-
- pip install tox
26+
- pip install tox "virtualenv<14"
2927
- pip install coveralls
3028

3129
script:

tox.ini

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@ testpaths=oauth2_provider
44

55
[tox]
66
envlist =
7-
{py27}-django{17,18,19},
8-
{py32}-django{17,18},
9-
{py33}-django{17,18},
10-
{py34}-django{17,18,19},
7+
{py27}-django{18,19},
8+
{py32}-django{18},
9+
{py33}-django{18},
10+
{py34}-django{18,19},
1111
{py35}-django{18,19},
1212
docs,
1313
flake8
1414

1515
[testenv]
1616
commands=python runtests.py -q --cov oauth2_provider --cov-report= --cov-append
1717
deps =
18-
django17: Django==1.7.11
19-
django18: Django==1.8.7
20-
django19: Django==1.9
18+
django18: Django==1.8.11
19+
django19: Django==1.9.4
2120
coverage<4
2221
-rrequirements/testing.txt
2322

0 commit comments

Comments
 (0)