Drop support for Django 1.5

Oscar's policy is to support two versions of Django. So while there
isn't a major reason to drop support for Django 1.5, dropping support
for Django 1.6 once 1.8 is released will reduce complexity considerably.

.travis.yml

@@ -10,9 +10,8 @@ env:
     # $TRANSIFEX_PASSWORD for oscar_bot (used in transifex.sh)
     secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
   matrix:
-    - DJANGO_VERSION=1.5.8
     - DJANGO_VERSION=1.6.5
-    - DJANGO_VERSION=https://www.djangoproject.com/download/1.7c1/tarball/
+    - DJANGO_VERSION=https://github.com/django/django/archive/2c6ef625ad73c38769f086733356e37a938b69c3.zip
 
 matrix:
   allow_failures:

docs/source/releases/v0.8.rst

@@ -37,7 +37,8 @@ availability logic now needs to be handled with strategies.
 Compatibility
 -------------
 
-Oscar 0.8 is compatible with Django 1.5-1.7. 
+Oscar 0.8 drops supports for Django 1.5, and is compatible with Django 1.6 and
+Django 1.7.
 
 Support for Python 2.6 has been dropped; Oscar works with Python 2.7, 3.3
 and 3.4.

oscar/app.py

@@ -48,37 +48,27 @@ class Shop(Application):
                 login_forbidden(auth_views.password_reset_done),
                 name='password-reset-done')]
 
-        # Django <=1.5: uses uidb36 to encode the user's primary key
+        # Django <=1.5: uses uidb36 to encode the user's primary key (support has been removed)
         # Django 1.6:   uses uidb64 to encode the user's primary key, but
         #               but supports legacy links
         # Django > 1.7: used uidb64 to encode the user's primary key
         # see https://docs.djangoproject.com/en/dev/releases/1.6/#django-contrib-auth-password-reset-uses-base-64-encoding-of-user-pk
-        if django.VERSION < (1, 6):
+        urls.append(
+            url(r'^password-reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
+                login_forbidden(auth_views.password_reset_confirm),
+                {
+                    'post_reset_redirect': reverse_lazy('password-reset-complete'),
+                    'set_password_form': self.set_password_form,
+                },
+                name='password-reset-confirm'))
+        if django.VERSION < (1, 7):
             urls.append(
                 url(r'^password-reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
-                    login_forbidden(auth_views.password_reset_confirm),
+                    login_forbidden(auth_views.password_reset_confirm_uidb36),
                     {
                         'post_reset_redirect': reverse_lazy('password-reset-complete'),
                         'set_password_form': self.set_password_form,
-                    },
-                    name='password-reset-confirm'))
-        else:
-            urls.append(
-                url(r'^password-reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
-                    login_forbidden(auth_views.password_reset_confirm),
-                    {
-                        'post_reset_redirect': reverse_lazy('password-reset-complete'),
-                        'set_password_form': self.set_password_form,
-                    },
-                    name='password-reset-confirm'))
-            if django.VERSION < (1, 7):
-                urls.append(
-                    url(r'^password-reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
-                        login_forbidden(auth_views.password_reset_confirm_uidb36),
-                        {
-                            'post_reset_redirect': reverse_lazy('password-reset-complete'),
-                            'set_password_form': self.set_password_form,
-                        }))
+                    }))
 
         urls += [
             url(r'^password-reset/complete/$',

oscar/apps/catalogue/managers.py

@@ -40,8 +40,6 @@ class ProductManager(models.Manager):
     def base_queryset(self):
         return self.get_queryset().base_queryset()
 
-    get_query_set = get_queryset  # Django 1.5 compatibility fix
-
 
 class BrowsableProductManager(ProductManager):
     """
@@ -52,5 +50,3 @@ class BrowsableProductManager(ProductManager):
 
     def get_queryset(self):
         return super(BrowsableProductManager, self).get_queryset().browsable()
-
-    get_query_set = get_queryset  # Django 1.5 compatibility fix

oscar/apps/customer/utils.py

@@ -1,10 +1,11 @@
 import logging
 
-import django
 from django.core.mail import EmailMessage, EmailMultiAlternatives
 from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.contrib.auth.tokens import default_token_generator
+from django.utils.http import urlsafe_base64_encode
+from django.utils.encoding import force_bytes
 
 from oscar.core.loading import get_model
 
@@ -111,14 +112,10 @@ def get_password_reset_url(user, token_generator=default_token_generator):
     """
     Generate a password-reset URL for a given user
     """
-    kwargs = {'token': token_generator.make_token(user)}
-    if django.VERSION < (1, 6):
-        from django.utils.http import int_to_base36
-        kwargs['uidb36'] = int_to_base36(user.id)
-    else:
-        from django.utils.http import urlsafe_base64_encode
-        from django.utils.encoding import force_bytes
-        kwargs['uidb64'] = urlsafe_base64_encode(force_bytes(user.id))
+    kwargs = {
+        'token': token_generator.make_token(user),
+        'uidb64': urlsafe_base64_encode(force_bytes(user.id)),
+    }
     return reverse('password-reset-confirm', kwargs=kwargs)
 
 

setup.py

@@ -35,7 +35,7 @@ setup(name='django-oscar',
       packages=find_packages(exclude=["sandbox*", "tests*"]),
       include_package_data=True,
       install_requires=[
-          'django>=1.5.7,<1.8',
+          'django>=1.6.5,<1.8',
           # PIL is required for image fields, Pillow is the "friendly" PIL fork
           'pillow>=1.7.8,<2.5',
           # Oscar ships with migrations

tox.ini

@@ -8,26 +8,11 @@ exclude = migrations
 max-complexity = 10
 
 [tox]
-envlist = py27-1.5, py27-1.6, py33-1.5, py33-1.6, py34-1.5, py34-1.6
+envlist = py27-1.6, py27-1.7, py33-1.6, py33-1.7, py34-1.6, py34-1.7
 
 [testenv]
 commands = python runtests.py []
 
-[testenv:py27-1.5]
-basepython = python2.7
-deps = -r{toxinidir}/requirements_py2.txt
-       django==1.5.8
-
-[testenv:py33-1.5]
-basepython = python3.3
-deps = -r{toxinidir}/requirements.txt
-       django==1.5.8
-
-[testenv:py34-1.5]
-basepython = python3.4
-deps = -r{toxinidir}/requirements.txt
-       django==1.5.8
-
 [testenv:py27-1.6]
 basepython = python2.7
 deps = -r{toxinidir}/requirements_py2.txt
@@ -46,14 +31,14 @@ deps = -r{toxinidir}/requirements.txt
 [testenv:py27-1.7]
 basepython = python2.7
 deps = -r{toxinidir}/requirements_py2.txt
-       https://www.djangoproject.com/download/1.7c1/tarball/
+       https://github.com/django/django/archive/2c6ef625ad73c38769f086733356e37a938b69c3.zip
 
 [testenv:py33-1.7]
 basepython = python3.3
 deps = -r{toxinidir}/requirements.txt
-       https://www.djangoproject.com/download/1.7c1/tarball/
+       https://github.com/django/django/archive/2c6ef625ad73c38769f086733356e37a938b69c3.zip
 
 [testenv:py34-1.7]
 basepython = python3.4
 deps = -r{toxinidir}/requirements.txt
-       https://www.djangoproject.com/download/1.7c1/tarball/
+       https://github.com/django/django/archive/2c6ef625ad73c38769f086733356e37a938b69c3.zip