Added Django 1.7\Python 3.4 tests runnets.

hellysmile · Aug 10, 2014 · 0db77a3 · 0db77a3
1 parent 763900b
commit 0db77a3
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 services:
   - redis-server
 python:
+  - "3.4"
   - "3.3"
   - "3.2"
   - "2.7"
@@ -12,6 +13,7 @@ env:
   - DJANGO="Django>=1.4,<1.5"
   - DJANGO="Django>=1.5,<1.6"
   - DJANGO="Django>=1.6,<1.7"
+  - DJANGO="https://github.com/django/django/tarball/stable/1.7.x#egg=django"
 matrix:
   exclude:
     - python: "3.3"
@@ -26,6 +28,8 @@ matrix:
       env: DJANGO="Django>=1.5,1.6"
     - python: "2.6"
       env: DJANGO="Django>=1.6,<1.7"
+    - python: "2.6"
+      env: DJANGO="https://github.com/django/django/tarball/stable/1.7.x#egg=django"
 install:
   - pip install $DJANGO
   - pip install coverage>=3.6 nose>=1.3.0 flake8>=2.0 coveralls>=0.3

diff --git a/tox.ini b/tox.ini
@@ -7,14 +7,21 @@ envlist =
     py27-dj14,
     py27-dj15,
     py27-dj16,
+    py27-dj17,
     py32-dj15,
     py32-dj15,
+    py32-dj17,
     py33-dj15,
     py33-dj16,
+    py33-dj17,
+    py34-dj15,
+    py34-dj16,
+    py34-dj17,
     pypy-dj13,
     pypy-dj14,
     pypy-dj15,
-    pypy-dj16
+    pypy-dj16,
+    pypy-dj17
 
 [base-pypy]
 deps =
@@ -73,6 +80,11 @@ deps =
     Django>=1.6,<1.7
     {[base]deps}
 
+[testenv:py27-dj17]
+basepython=python2.7
+deps =
+    https://github.com/django/django/tarball/stable/1.7.x#egg=django
+    {[base]deps}
 
 [testenv:py32-dj15]
 basepython=python3.2
@@ -86,6 +98,12 @@ deps =
     Django>=1.6,<1.7
     {[base]deps}
 
+[testenv:py32-dj17]
+basepython=python3.2
+deps =
+    https://github.com/django/django/tarball/stable/1.7.x#egg=django
+    {[base]deps}
+
 [testenv:py33-dj15]
 basepython=python3.3
 deps =
@@ -98,6 +116,30 @@ deps =
     Django>=1.6,<1.7
     {[base]deps}
 
+[testenv:py33-dj17]
+basepython=python3.3
+deps =
+    https://github.com/django/django/tarball/stable/1.7.x#egg=django
+    {[base]deps}
+
+[testenv:py34-dj15]
+basepython=python3.4
+deps =
+    Django>=1.5,<1.6
+    {[base]deps}
+
+[testenv:py34-dj16]
+basepython=python3.4
+deps =
+    Django>=1.6,<1.7
+    {[base]deps}
+
+[testenv:py34-dj17]
+basepython=python3.4
+deps =
+    https://github.com/django/django/tarball/stable/1.7.x#egg=django
+    {[base]deps}
+
 [testenv:pypy-dj13]
 basepython=pypy
 deps =
@@ -121,3 +163,10 @@ basepython=pypy
 deps =
     Django>=1.6,<1.7
     {[base-pypy]deps}
+
+[testenv:pypy-dj17]
+basepython=pypy
+deps =
+    https://github.com/django/django/tarball/stable/1.7.x#egg=django
+    {[base-pypy]deps}
+