Skip to content

Commit

Permalink
django 1.7 tests use 1.7.0 not the RC in tox. Added python34 and djan…
Browse files Browse the repository at this point in the history
…go17 environments to travis config
  • Loading branch information
Craig Bruce committed Sep 5, 2014
1 parent e983442 commit 754592c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@ env:
- TOX_ENV=py27-django14
- TOX_ENV=py27-django15
- TOX_ENV=py27-django16
- TOX_ENV=py27-django17
- TOX_ENV=py33-django15
- TOX_ENV=py33-django16
- TOX_ENV=py33-django17
- TOX_ENV=py34-django15
- TOX_ENV=py34-django16
- TOX_ENV=py34-django17
- TOX_ENV=docs

install:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Requirements
------------

* Python 2.6, 2.7, 3.3, 3.4
* Django 1.4, 1.5, 1.6, 1.7rc1
* Django 1.4, 1.5, 1.6, 1.7

Installation
------------
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ deps =
[testenv:py27-django17]
basepython = python2.7
deps =
https://www.djangoproject.com/download/1.7c1/tarball/
Django<1.8
{[testenv]deps}

[testenv:py33-django15]
Expand All @@ -74,7 +74,7 @@ deps =
[testenv:py33-django17]
basepython = python3.3
deps =
https://www.djangoproject.com/download/1.7c1/tarball/
Django<1.8
{[testenv]deps}

[testenv:py34-django15]
Expand All @@ -93,7 +93,7 @@ deps =
[testenv:py34-django17]
basepython = python3.4
deps =
https://www.djangoproject.com/download/1.7c1/tarball/
Django<1.8
{[testenv]deps}

[testenv:docs]
Expand Down

0 comments on commit 754592c

Please sign in to comment.