Skip to content

Commit 7b639c0

Browse files
committed
Drop django master from the build matrix.
Currently always going to be a know failure case. We can add it back when we start to consdier Django 1.9 support.
1 parent 873fb69 commit 7b639c0

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

.travis.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,6 @@ env:
2525
- TOX_ENV=py33-django18alpha
2626
- TOX_ENV=py32-django18alpha
2727
- TOX_ENV=py27-django18alpha
28-
- TOX_ENV=py34-djangomaster
29-
- TOX_ENV=py33-djangomaster
30-
- TOX_ENV=py32-djangomaster
31-
- TOX_ENV=py27-djangomaster
32-
33-
matrix:
34-
fast_finish: true
35-
allow_failures:
36-
- env: TOX_ENV=py34-djangomaster
37-
- env: TOX_ENV=py33-djangomaster
38-
- env: TOX_ENV=py32-djangomaster
39-
- env: TOX_ENV=py27-djangomaster
4028

4129
install:
4230
- pip install tox

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ envlist =
33
py27-{flake8,docs},
44
{py26,py27}-django14,
55
{py26,py27,py32,py33,py34}-django{15,16},
6-
{py27,py32,py33,py34}-django{17,18alpha,master}
6+
{py27,py32,py33,py34}-django{17,18alpha}
77

88
[testenv]
99
commands = ./runtests.py --fast
@@ -15,7 +15,6 @@ deps =
1515
django16: Django==1.6.3 # Should track minimum supported
1616
django17: Django==1.7.2 # Should track maximum supported
1717
django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/
18-
djangomaster: https://github.com/django/django/zipball/master
1918
{py26,py27}-django{14,15,16,17}: django-guardian==1.2.3
2019
{py26,py27}-django{14,15,16}: oauth2==1.5.211
2120
{py26,py27}-django{14,15,16}: django-oauth-plus==2.2.1

0 commit comments

Comments
 (0)