Skip to content

Commit

Permalink
update to Django 1.8 Beta 1
Browse files Browse the repository at this point in the history
  • Loading branch information
trbs committed Feb 25, 2015
1 parent 3365b44 commit 8421d59
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ env:
- TOX_ENV=py34-dj15
- TOX_ENV=py34-dj16
- TOX_ENV=py27-dj17
- TOX_ENV=py27-dj18a
- TOX_ENV=py27-dj18
- TOX_ENV=py27-djmaster
- TOX_ENV=py32-dj17
- TOX_ENV=py32-dj18a
- TOX_ENV=py32-dj18
- TOX_ENV=py32-djmaster
- TOX_ENV=py33-dj17
- TOX_ENV=py33-dj18a
- TOX_ENV=py33-dj18
- TOX_ENV=py33-djmaster
- TOX_ENV=py34-dj17
- TOX_ENV=py34-dj18a
- TOX_ENV=py34-dj18
- TOX_ENV=py34-djmaster
- TOX_ENV=pypy-dj17
- TOX_ENV=pypy-dj18a
- TOX_ENV=pypy-dj18
- TOX_ENV=pypy-djmaster
- TOX_ENV=pypy3-dj17
- TOX_ENV=pypy3-dj18a
- TOX_ENV=pypy3-dj18
- TOX_ENV=pypy3-djmaster

matrix:
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ envlist =
{py27,py34}-flake8,
{py26,py27}-dj14,
{py26,py27,py32,py33,py34}-dj{15,16},
{py27,py32,py33,py34,pypy,pypy3}-dj{17,18a,master}
{py27,py32,py33,py34,pypy,pypy3}-dj{17,18,master}

[testenv]
commands = py.test {posargs}
Expand All @@ -18,7 +18,7 @@ deps =
dj15: Django>=1.5,<1.6
dj16: Django>=1.6,<1.7
dj17: Django>=1.7,<1.8
dj18a: https://www.djangoproject.com/download/1.8a1/tarball/
dj18: https://www.djangoproject.com/download/1.8b1/tarball/
djmaster: https://github.com/django/django/zipball/master
shortuuid==0.4
python-dateutil
Expand Down

0 comments on commit 8421d59

Please sign in to comment.