Merge pull request #938 from kaedroho/travis-changes

Travis changes

.travis.yml

@@ -1,11 +1,21 @@
 language: python
-env:
-  - TOXENV=py27-dj17-postgres
-  - TOXENV=py27-dj17-sqlite
-  - TOXENV=py32-dj17-postgres
-#  - TOXENV=py33-dj17-postgres
-  - TOXENV=py34-dj17-postgres
-  - TOXENV=py34-dj17-sqlite
+
+matrix:
+  include:
+   - env: TOXENV=py27-dj17-postgres
+   - env: TOXENV=py27-dj17-sqlite
+   - env: TOXENV=py33-dj17-postgres
+   - env: TOXENV=py34-dj17-postgres
+   - env: TOXENV=py34-dj17-sqlite
+   - env: TOXENV=py27-dj18-postgres
+#   - env: TOXENV=py27-dj18-sqlite
+#  - env: TOXENV=py33-dj18-postgres
+   - env: TOXENV=py34-dj18-postgres
+   - env: TOXENV=py34-dj18-sqlite
+  allow_failures:
+   - env: TOXENV=py27-dj18-postgres
+   - env: TOXENV=py34-dj18-postgres
+   - env: TOXENV=py34-dj18-sqlite
 
 # Services
 services:

tox.ini

@@ -26,6 +26,9 @@ dj17 =
 dj171 =
     Django==1.7.1
 
+dj18 =
+    https://github.com/django/django/archive/stable/1.8.x.zip#egg=django
+
 py2 =
     unicodecsv>=0.9.4
 
@@ -39,12 +42,17 @@ usedevelop = True
 envlist =
     py27-dj17-postgres,
     py27-dj17-sqlite,
-    py32-dj17-postgres,
-    py32-dj17-sqlite,
     py33-dj17-postgres,
     py33-dj17-sqlite,
     py34-dj17-postgres,
-    py34-dj17-sqlite
+    py34-dj17-sqlite,
+    py27-dj18-postgres,
+    py27-dj18-sqlite,
+    py33-dj18-postgres,
+    py33-dj18-sqlite,
+    py34-dj18-postgres,
+    py34-dj18-sqlite
+
 
 # mysql not currently supported
 # (wagtail.wagtailimages.tests.TestImageEditView currently fails with a
@@ -87,25 +95,6 @@ setenv =
     DATABASE_ENGINE=django.db.backends.mysql
     DATABASE_USER=wagtail
 
-[testenv:py32-dj17-postgres]
-basepython=python3.2
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj17}
-    psycopg2==2.5.3
-setenv =
-    DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
-
-[testenv:py32-dj17-sqlite]
-basepython=python3.2
-deps =
-    {[deps]base}
-    {[deps]py3}
-    {[deps]dj171}
-setenv =
-    DATABASE_ENGINE=django.db.backends.sqlite3
-
 [testenv:py33-dj17-postgres]
 basepython=python3.3
 deps =
@@ -143,3 +132,72 @@ deps =
     {[deps]dj171}
 setenv =
     DATABASE_ENGINE=django.db.backends.sqlite3
+
+
+[testenv:py27-dj18-postgres]
+basepython=python2.7
+deps =
+    {[deps]base}
+    {[deps]py2}
+    {[deps]dj18}
+    psycopg2==2.5.3
+setenv =
+    DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
+
+[testenv:py27-dj18-sqlite]
+basepython=python2.7
+deps =
+    {[deps]base}
+    {[deps]py2}
+    {[deps]dj18}
+setenv =
+    DATABASE_ENGINE=django.db.backends.sqlite3
+
+[testenv:py27-dj18-mysql]
+basepython=python2.7
+deps =
+    {[deps]base}
+    {[deps]py2}
+    {[deps]dj18}
+    MySQL-python==1.2.5
+setenv =
+    DATABASE_ENGINE=django.db.backends.mysql
+    DATABASE_USER=wagtail
+
+[testenv:py33-dj18-postgres]
+basepython=python3.3
+deps =
+    {[deps]base}
+    {[deps]py3}
+    {[deps]dj18}
+    psycopg2==2.5.3
+setenv =
+    DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
+
+[testenv:py33-dj18-sqlite]
+basepython=python3.3
+deps =
+    {[deps]base}
+    {[deps]py3}
+    {[deps]dj18}
+setenv =
+    DATABASE_ENGINE=django.db.backends.sqlite3
+
+[testenv:py34-dj18-postgres]
+basepython=python3.4
+deps =
+    {[deps]base}
+    {[deps]py3}
+    {[deps]dj18}
+    psycopg2==2.5.3
+setenv =
+    DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
+
+[testenv:py34-dj18-sqlite]
+basepython=python3.4
+deps =
+    {[deps]base}
+    {[deps]py3}
+    {[deps]dj18}
+setenv =
+    DATABASE_ENGINE=django.db.backends.sqlite3