Merge pull request #3670 from jpadilla/django-versions

Update Django versions
This commit is contained in:
Xavier Ordoquy 2015-11-24 19:42:17 +01:00
commit ff0eeaf77a

12
tox.ini
View File

@ -12,9 +12,9 @@ commands = ./runtests.py --fast {posargs} --coverage
setenv = setenv =
PYTHONDONTWRITEBYTECODE=1 PYTHONDONTWRITEBYTECODE=1
deps = deps =
django17: Django==1.7.10 django17: Django==1.7.11
django18: Django==1.8.6 django18: Django==1.8.7
django19: https://www.djangoproject.com/download/1.9rc1/tarball/ django19: https://www.djangoproject.com/download/1.9rc2/tarball/
-rrequirements/requirements-testing.txt -rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt -rrequirements/requirements-optionals.txt
@ -33,21 +33,21 @@ deps =
# Specify explicitly to exclude Django Guardian against Django 1.9 # Specify explicitly to exclude Django Guardian against Django 1.9
[testenv:py27-django19] [testenv:py27-django19]
deps = deps =
https://www.djangoproject.com/download/1.9rc1/tarball/ https://www.djangoproject.com/download/1.9rc2/tarball/
-rrequirements/requirements-testing.txt -rrequirements/requirements-testing.txt
markdown==2.5.2 markdown==2.5.2
django-filter==0.10.0 django-filter==0.10.0
[testenv:py34-django19] [testenv:py34-django19]
deps = deps =
https://www.djangoproject.com/download/1.9rc1/tarball/ https://www.djangoproject.com/download/1.9rc2/tarball/
-rrequirements/requirements-testing.txt -rrequirements/requirements-testing.txt
markdown==2.5.2 markdown==2.5.2
django-filter==0.10.0 django-filter==0.10.0
[testenv:py35-django19] [testenv:py35-django19]
deps = deps =
https://www.djangoproject.com/download/1.9rc1/tarball/ https://www.djangoproject.com/download/1.9rc2/tarball/
-rrequirements/requirements-testing.txt -rrequirements/requirements-testing.txt
markdown==2.5.2 markdown==2.5.2
django-filter==0.10.0 django-filter==0.10.0