Merge pull request #130 from django-oscar/update-travis

Sanify travis.yml and add Django 2.1

.travis.yml

@@ -10,20 +10,25 @@ python:
     - 3.6
 
 env:
-    - DJANGO=Django==1.11.13 OSCAR=django-oscar==1.5.4
-    - DJANGO=Django==2.0.5 OSCAR=django-oscar==1.6
+    - DJANGO='Django<2.0' OSCAR='django-oscar<1.6'
+    - DJANGO='Django<2.0' OSCAR='django-oscar<1.7'
+    - DJANGO='Django<2.1' OSCAR='django-oscar<1.7'
+    - DJANGO='Django<2.2' OSCAR='django-oscar<1.7'
 
 matrix:
   exclude:
     - python: 2.7
-      env: DJANGO=Django==2.0.5 OSCAR=django-oscar==1.6
+      env: DJANGO='Django<2.1' OSCAR='django-oscar<1.7'
+    - python: 2.7
+      env: DJANGO='Django<2.2' OSCAR='django-oscar<1.7'
 
 before_install:
     - pip install codecov
 
 install:
-    - pip install $OSCAR
-    - if [ ${DJANGO} == "Django==2.0.5" ]; then pip install "djangorestframework>=3.7"; fi
+    - pip install $OSCAR $DJANGO
+    - if ! [ ${DJANGO} == "Django<2.0" ]; then pip install "djangorestframework>=3.7"; fi
+    - pip freeze
     - make install
 
 script:

docs/source/index.rst

@@ -20,8 +20,8 @@ Django 1.11:
 - Osccar 1.5.3 / 1.6
 - requires `djangorestframework>=3.4`
 
-Django 2.0:
-~~~~~~~~~~~
+Django 2.0 and 2.1:
+~~~~~~~~~~~~~~~~~~~
 - Oscar 1.6
 - requires `djangorestframework>=3.7`
 - requires python 3.x