Merge pull request #123 from django-oscar/feature/update-travis-and-docs

Updated Django and Oscar versions. Removed 1.10 from docs
django-oscar · Apr 23, 2018 · 7b8f2de · 7b8f2de
2 parents 75809ad + 7fe4e39
commit 7b8f2de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,9 +15,8 @@ python:
     - '3.6'
 
 env:
-    - DJANGO=Django==1.8.18 OSCAR=django-oscar==1.5.1
-    - DJANGO=Django==1.10.8 OSCAR=django-oscar==1.5.1
-    - DJANGO=Django==1.11.9 OSCAR=django-oscar==1.5.1
+    - DJANGO=Django==1.8.19 OSCAR=django-oscar==1.5.3
+    - DJANGO=Django==1.11.12 OSCAR=django-oscar==1.5.3
 
 before_install:
     - pip install codecov

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -17,17 +17,12 @@ This version of Oscar API is compatbile with python 2.7 / 3.5 / 3.6 and the foll
 
 Django 1.8:
 ~~~~~~~~~~~
-- Oscar 1.5.1
+- Oscar 1.5.3
 - requires `djangorestframework<3.7`, and `django-tables2<1.17.0`
 
-Django 1.10:
-~~~~~~~~~~~~
-- Osccar 1.5.1
-- requires `djangorestframework>=3.4`
-
 Django 1.11:
 ~~~~~~~~~~~~
-- Osccar 1.5.1 
+- Osccar 1.5.3 
 - requires `djangorestframework>=3.4`