Mikhail Korobov avatar Mikhail Korobov committed 7790b4d

update tox config with recent django versions

Comments (0)

Files changed (2)

django_webtest_tests/settings.py

 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/admin/'
+ADMIN_MEDIA_PREFIX = '/static/admin/'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '5mcs97ar-(nnxhfkx0%^+0^sr!e(ax=x$2-!8dqy25ff-l1*a='
 [tox]
-envlist = py26,py27,pypy,py32,dj12,dj13,dj14
+envlist = py26,py27,pypy,dj12,dj13,dj14,dj15,dj15-py32
 
 [testenv]
 deps=
 commands=
     python django_webtest_tests/runtests.py
 
-[testenv:py32]
-deps=
-    WebTest
-    https://bitbucket.org/vinay.sajip/django/get/tip.zip#egg=django
-
 [testenv:dj12]
 deps=
     WebTest
 [testenv:dj14]
 deps=
     WebTest
-    django == 1.4
+    django == 1.4.1
+
+[django15]
+deps=
+    git+https://github.com/django/django.git@fbd4b3a5188d0b488648f1fdd2339e1eac6722a2#egg=django
+
+[testenv:dj15]
+deps=
+    WebTest
+    {[django15]deps}
+
+[testenv:dj15-py32]
+deps=
+    {[testenv:dj15]deps}
+basepython = python3.2
+
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.