Merge pull request #113 from django-oscar/feature/update-dependencies

Update dependencies: django-tables2, oscar 1.5.1, updated documentation

.travis.yml

@@ -10,28 +10,26 @@ cache:
 language: python
 
 python:
-    - '2.7.13'
+    - '2.7.14'
     - '3.5'
     - '3.6'
 
 env:
     - DJANGO=Django==1.8.18 OSCAR=django-oscar==1.2.2
     - DJANGO=Django==1.8.18 OSCAR=django-oscar==1.3
     - DJANGO=Django==1.8.18 OSCAR=django-oscar==1.4
-    - DJANGO=Django==1.8.18 OSCAR=django-oscar==1.5
+    - DJANGO=Django==1.8.18 OSCAR=django-oscar==1.5.1
     - DJANGO=Django==1.10.8 OSCAR=django-oscar==1.4
-    - DJANGO=Django==1.10.8 OSCAR=django-oscar==1.5
-    - DJANGO=Django==1.11.7 OSCAR=django-oscar==1.5
+    - DJANGO=Django==1.10.8 OSCAR=django-oscar==1.5.1
+    - DJANGO=Django==1.11.8 OSCAR=django-oscar==1.5.1
 
 before_install:
     - pip install codecov
 
 install:
     - pip install $OSCAR
-    # django rest framework 3.7+ is not compatible with django 1.8
-    - if [ ${DJANGO} == "Django==1.8.18" ]; then pip install "djangorestframework<3.7"; fi
-    # because there are some dependency issues with oscar and haystack
-    - if [ ${DJANGO} == "Django==1.11.7" ]; then pip install $DJANGO -e .[django_1_11]; else pip install $DJANGO -e .; fi
+    # django rest framework 3.7+ and django-tables2 1.17+ are not compatible with django 1.8
+    - if [ ${DJANGO} == "Django==1.8.18" ]; then pip install "djangorestframework<3.7"; pip install "django-tables2<1.17.0"; fi
     - make install
 
 script:

docs/source/index.rst

@@ -15,9 +15,9 @@ Requirements:
 -------------
 Currently Oscar API is compatbile with python 2.7 / 3.5 / 3.6 and the following django versions:
 
-- Django 1.8: Oscar 1.2.2 / 1.3 / 1.4 and 1.5 (requires `djangorestframework<3.7`)
-- Django 1.10:  Osccar 1.4 and 1.5 (requires `djangorestframework>=3.4`)
-- Django 1.11:  Osccar 1.5 (requires `djangorestframework>=3.4`)
+- Django 1.8: Oscar 1.2.2 / 1.3 / 1.4 and 1.5.1 (requires `djangorestframework<3.7`, and `django-tables2<1.17.0`)
+- Django 1.10:  Osccar 1.4 and 1.5.1 (requires `djangorestframework>=3.4`)
+- Django 1.11:  Osccar 1.5.1 (requires `djangorestframework>=3.4`)
 
 
 See `Travis`_ for the current tested platforms.
@@ -41,12 +41,14 @@ Or you could add ``django-oscar-api`` to your project dependencies.
 
 .. warning::
 
-    Due to wrong dependency specifications in `django-oscar` (`django-haystack` 1.6.1 depends on `Django<1.11`), and of `django-haystack` (The django requirements are not correct) you will need to install Oscar API like this if you would like to use Django 1.11 with Oscar 1.5:
+    Due to wrong dependency specifications in `django-oscar` (`django-haystack` 1.6.1 depends on `Django<1.11`), and of `django-haystack` (The django requirements are not correct) you will need to install Oscar API like this if you would like to use Django 1.11 with Oscar 1.5.0:
 
     .. code-block:: bash
 
         $ pip install django-oscar-api[django_1_11]
 
+    This is fixed in Oscar 1.5.1
+
 .. note::
 
     If you would like to install the current development version, use this: