Test against new Oscar and Django releases

Our policy is to support the two latest versions of Django and Oscar.
This commit moves us towards that goal by enabling tests for them.

Some requirements needed bumping to get the tests to start.

.travis.yml

@@ -1,34 +1,26 @@
 language: python
 
-python:
-    - '2.7'
-
 env:
-    matrix:
-        # Django 1.6
-        - COMBO="Django==1.6.8 django-oscar==0.7.2"
-        - COMBO="Django==1.6.8 South==1.0.1 django-oscar==1.0"
-        # Django 1.7
-        - COMBO="Django==1.7.1 django-oscar==1.0"
+  # Generated with https://www.dominicrodger.com/tox-and-travis.html
+  - TOX_ENV=py27-django17-oscar10
+  - TOX_ENV=py27-django17-oscar11
+  - TOX_ENV=py27-django18-oscar10
+  - TOX_ENV=py27-django18-oscar11
+  - TOX_ENV=py33-django17-oscar10
+  - TOX_ENV=py33-django17-oscar11
+  - TOX_ENV=py33-django18-oscar10
+  - TOX_ENV=py33-django18-oscar11
+  - TOX_ENV=py34-django17-oscar10
+  - TOX_ENV=py34-django17-oscar11
+  - TOX_ENV=py34-django18-oscar10
+  - TOX_ENV=py34-django18-oscar11
 
-matrix:
-    include:
-        - python: '3.3'
-          env: COMBO="Django==1.6.8 South==1.0.1 django-oscar==1.0"
-        - python: '3.3'
-          env: COMBO="Django==1.7.1 django-oscar==1.0"
-        - python: '3.4'
-          env: COMBO="Django==1.6.8 South==1.0.1 django-oscar==1.0"
-        - python: '3.4'
-          env: COMBO="Django==1.7.1 django-oscar==1.0"
 
 install:
-    - pip install $COMBO -r requirements.txt -e .
+    - pip install tox
 
 script:
-    - coverage run ./runtests.py
+    - tox -e $TOX_ENV
 
-after_success:
-    - coveralls
 notifications:
   email: false

requirements.txt

@@ -1,11 +1,11 @@
 # Testing
 mock==1.0.1
 coverage==3.7.1
-django-nose==1.3
+django-nose==1.4.2
 coveralls==0.4.4
 django-webtest==1.7.7
-tox==1.8.1
-detox==0.9.3
+tox==2.1.0
+detox==0.10.0
 WebTest==2.0.16
 pinocchio==0.4.1
 

tox.ini

@@ -1,50 +1,11 @@
+[tox]
+envlist = py{27,33,34}-django{17,18}-oscar{10,11}
+
 [testenv]
 commands = python runtests.py []
-deps = -r{toxinidir}/requirements.txt
-
-# Django 1.6
-
-[testenv:D16-O07]
-basepython = python2.7
-deps = {[testenv]deps}
-    Django==1.6.8
-    django-oscar==0.7.3
-
-[testenv:D16-O10-P27]
-basepython = python2.7
-deps = {[testenv]deps}
-    Django==1.6.8
-    South==1.0.1
-    django-oscar==1.0
-
-[testenv:D16-O10-P33]
-basepython = python3.3
-deps = {[testenv]deps}
-       Django==1.6.8
-       django-oscar==1.0
-
-[testenv:D16-O10-P34]
-basepython = python3.4
-deps = {[testenv]deps}
-       Django==1.6.8
-       django-oscar==1.0
-
-# Django 1.7
-
-[testenv:D17-O10-P27]
-basepython = python2.7
-deps = {[testenv]deps}
-    Django==1.7.1
-    django-oscar==1.0
-
-[testenv:D17-O10-P33]
-basepython = python3.3
-deps = {[testenv]deps}
-    Django==1.7.1
-    django-oscar==1.0
-
-[testenv:D17-O10-P34]
-basepython = python3.4
-deps = {[testenv]deps}
-    Django==1.7.1
-    django-oscar==1.0
+deps =
+    -r{toxinidir}/requirements.txt
+    django17: Django==1.7.10
+    django18: Django==1.8.5
+    oscar10: django-oscar==1.0.2
+    oscar11: django-oscar==1.1.1