Merge pull request #109 from django-oscar/feature/django-1.11

Added Django 1.11 support with Oscar 1.5
django-oscar · Nov 6, 2017 · 4e4fdee · 4e4fdee
2 parents 4025f73 + c9b4ac9
commit 4e4fdee
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,25 +15,23 @@ python:
     - '3.6'
 
 env:
-    - DJANGO=Django==1.8.18 OSCAR=django-oscar==1.1.1
     - 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.9.13 OSCAR=django-oscar==1.3
-    - DJANGO=Django==1.9.13 OSCAR=django-oscar==1.4
-    - DJANGO=Django==1.10.7 OSCAR=django-oscar==1.3
-    - DJANGO=Django==1.10.7 OSCAR=django-oscar==1.4
-matrix:
-    exclude:
-        - python: "3.6"
-          env: DJANGO=Django==1.8.18 OSCAR=django-oscar==1.1.1
+    - DJANGO=Django==1.8.18 OSCAR=django-oscar==1.5
+    - 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
 
 before_install:
     - pip install codecov
 
 install:
     - pip install $OSCAR
-    - pip install $DJANGO -e .
+    # 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
     - make install
 
 script:

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -15,9 +15,10 @@ Requirements:
 -------------
 Currently Oscar API is compatbile with python 2.7 / 3.5 / 3.6 and the following django versions:
 
-- Django 1.8: Oscar 1.1,1 / 1.2.2 / 1.3 and 1.4
-- Django 1.9:  Oscar 1.3 and 1.4
-- Django 1.10:  Osccar 1.4 (requires `djangorestframework>=3.4`)
+- 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`)
+
 
 See `Travis`_ for the current tested platforms.
 
@@ -38,6 +39,14 @@ Please see the installation instructions of `Oscar`_ to install Oscar and how to
 
 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:
+
+    .. code-block:: bash
+
+        $ pip install django-oscar-api[django_1_11]
+
 .. note::
 
     If you would like to install the current development version, use this:

diff --git a/setup.py b/setup.py
@@ -15,8 +15,8 @@
         'Environment :: Web Environment',
         'Framework :: Django',
         'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: Unix',
@@ -44,13 +44,14 @@
     # specify dependencies
     install_requires=[
         'setuptools',
-        'django-oscar>=1.1,<1.5',
+        'django-oscar>=1.2.2',
         'djangorestframework>=3.3',
         'six'
     ],
     # mark test target to require extras.
     extras_require={
         'test': ['django-nose', 'coverage', 'mock'],
-        'docs': ['sphinx', 'sphinx_rtd_theme']
+        'docs': ['django-haystack<=2.7.0.dev0', 'sphinx', 'sphinx_rtd_theme'],
+        'django_1_11': ['django-haystack<=2.7.0.dev0']
     },
 )