Skip to content

Commit

Permalink
Drop Django 1.6 and 1.7 from the tox and Travis test matrix.
Browse files Browse the repository at this point in the history
  • Loading branch information
mblayman committed Mar 31, 2016
1 parent de4a540 commit 443c416
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
20 changes: 1 addition & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ env:
- TOX_ENV=py27-flake8
- TOX_ENV=py27-docs

- TOX_ENV=py27-django1.7-drf2.4
- TOX_ENV=py27-django1.7-drf3.0
- TOX_ENV=py27-django1.7-drf3.1
- TOX_ENV=py27-django1.7-drf3.2
- TOX_ENV=py27-django1.7-drf3.3

- TOX_ENV=py27-django1.8-drf3.0
- TOX_ENV=py27-django1.8-drf3.1
- TOX_ENV=py27-django1.8-drf3.2
Expand All @@ -21,23 +15,11 @@ env:
- TOX_ENV=py27-django1.9-drf3.2
- TOX_ENV=py27-django1.9-drf3.3

- TOX_ENV=py33-django1.7-drf2.4
- TOX_ENV=py33-django1.7-drf3.0
- TOX_ENV=py33-django1.7-drf3.1
- TOX_ENV=py33-django1.7-drf3.2
- TOX_ENV=py33-django1.7-drf3.3

- TOX_ENV=py33-django1.8-drf3.0
- TOX_ENV=py33-django1.8-drf3.1
- TOX_ENV=py33-django1.8-drf3.2
- TOX_ENV=py33-django1.8-drf3.3

- TOX_ENV=py34-django1.7-drf2.4
- TOX_ENV=py34-django1.7-drf3.0
- TOX_ENV=py34-django1.7-drf3.1
- TOX_ENV=py34-django1.7-drf3.2
- TOX_ENV=py34-django1.7-drf3.3

- TOX_ENV=py34-django1.8-drf3.0
- TOX_ENV=py34-django1.8-drf3.1
- TOX_ENV=py34-django1.8-drf3.2
Expand All @@ -51,7 +33,7 @@ matrix:
fast_finish: true

install:
- pip install tox
- pip install tox

script:
- tox -e $TOX_ENV
3 changes: 0 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
[tox]
envlist =
py27-{flake8,docs},
{py27,py33,py34}-django{1.6,1.7}-drf{2.4,3.0,3.1,3.2,3.3},
{py27,py33,py34}-django{1.8,1.9}-drf{3.0,3.1,3.2,3.3}

[testenv]
commands = ./runtests.py --fast {posargs}
setenv =
PYTHONDONTWRITEBYTECODE=1
deps =
django1.6: Django==1.6.11 # Should track minimum supported
django1.7: Django==1.7.11 # Should track maximum supported
django1.8: Django==1.8.7 # Should track maximum supported
django1.9: Django==1.9.0 # Should track maximum supported
drf2.4: djangorestframework==2.4.5 # Should track minimum supported
Expand Down

0 comments on commit 443c416

Please sign in to comment.