Add pypy compatibility testing, explicitly test django 1.7 branch and master

.travis.yml

@@ -1,9 +1,15 @@
 language: python
 python: 2.7
 env:
+  - TOX_ENV=py33-master
   - TOX_ENV=py33-1.7.x
   - TOX_ENV=py33-1.6.x
   - TOX_ENV=py33-1.5.x
+  - TOX_ENV=pypy-master
+  - TOX_ENV=pypy-1.7.x
+  - TOX_ENV=pypy-1.6.x
+  - TOX_ENV=pypy-1.5.x
+  - TOX_ENV=py27-master
   - TOX_ENV=py27-1.7.x
   - TOX_ENV=py27-1.6.x
   - TOX_ENV=py27-1.5.x

tox.ini

@@ -10,63 +10,65 @@ deps15 =
 deps16 =
         https://github.com/django/django/archive/stable/1.6.x.zip#egg=django
 deps17 =
-        https://github.com/django/django/archive/master.zip#egg=django
+        https://github.com/django/django/archive/stable/1.7.x.zip#egg=django
+master =
+        https://github.com/django/django/archive/stable/1.7.x.zip#egg=django
 
 [testenv:py26-1.5.x]
 basepython = python2.6
-deps =
+deps = {[testenv]deps15}
-        {[testenv]deps15}
 
 [testenv:py26-1.6.x]
 basepython = python2.6
-deps =
+deps = {[testenv]deps16}
-        {[testenv]deps16}
 
 [testenv:py27-1.5.x]
 basepython = python2.7
-deps =
+deps = {[testenv]deps15}
-        {[testenv]deps15}
 
 [testenv:py27-1.6.x]
 basepython = python2.7
-deps =
+deps = {[testenv]deps16}
-        {[testenv]deps16}
 
 [testenv:py27-1.7.x]
 basepython = python2.7
-deps =
+deps = {[testenv]deps17}
-        {[testenv]deps17}
+
+[testenv:py27-master]
+basepython = python2.7
+deps = {[testenv]master}
 
 [testenv:py33-1.5.x]
 basepython = python3.3
-deps =
+deps = {[testenv]deps15}
-        {[testenv]deps15}
 
 [testenv:py33-1.6.x]
 basepython = python3.3
-deps =
+deps = {[testenv]deps16}
-        {[testenv]deps16}
 
 [testenv:py33-1.7.x]
 basepython = python3.3
-deps =
+deps = {[testenv]deps17}
-        {[testenv]deps17}
+
+[testenv:py33-master]
+basepython = python3.3
+deps = {[testenv]master}
 
 [testenv:pypy-1.5.x]
 basepython = pypy
-deps =
+deps = {[testenv]deps17}
-        {[testenv]deps17}
-
 
 [testenv:pypy-1.6.x]
 basepython = pypy
-deps =
+deps = {[testenv]deps17}
-        {[testenv]deps17}
 
 [testenv:pypy-1.7.x]
 basepython = pypy
-deps =
+deps = {[testenv]deps17}
-        {[testenv]deps17}
+
+[testenv:pypy-master]
+basepython = pypy
+deps = {[testenv]master}
 
 [docs]
 commands =