diff options
| author | Tom Christie | 2014-09-03 18:48:51 +0100 |
|---|---|---|
| committer | Tom Christie | 2014-09-03 18:48:51 +0100 |
| commit | 415b33b49f18b1e4ece3d18d26a3f4df09d5d2ad (patch) | |
| tree | 00317b6f615a444b985fe7eefda5a86cb2920e8f /tox.ini | |
| parent | f08afe162cb1d0a589674ca26dc6184c7b3d185c (diff) | |
| parent | fc250bf74bf3d88376bd1d41eab7c1ff6f4f8e5e (diff) | |
| download | django-rest-framework-415b33b49f18b1e4ece3d18d26a3f4df09d5d2ad.tar.bz2 | |
Merge pull request #1827 from jpadilla/master
Test with released Django 1.7
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -18,7 +18,7 @@ commands = ./runtests.py --lintonly [testenv:py3.4-django1.7] basepython = python3.4 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -26,7 +26,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ [testenv:py3.3-django1.7] basepython = python3.3 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -34,7 +34,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ [testenv:py3.2-django1.7] basepython = python3.2 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -42,7 +42,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ [testenv:py2.7-django1.7] basepython = python2.7 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 # django-oauth-plus==2.2.1 |