Drop support for Python<2.7 and Django<1.8

Author: jleclanche

.travis.yml

@@ -1,23 +1,11 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"
   - "3.4"
 env:
-  - DJANGO=1.5
-  - DJANGO=1.6
-  - DJANGO=1.7
-matrix:
-  exclude:
-    - python: "2.6"
-      env: DJANGO=1.7
-allow_failures:
-  python:
-    - "3.2"
-    - "3.3"
-    - "3.4"
+  - DJANGO=1.8
 install:
   - pip install -q Django==$DJANGO --use-mirrors
   - pip install -r requirements.txt --use-mirrors

README.rst

@@ -22,13 +22,9 @@ single messages.
 
 Dependencies
 ------------
-All versions of Django 1.0 and newer should be supported, however no guarantees are made for versions older than 1.4.
+Django 1.8 is required. Support for older versions is available in the release 1.2.1.
 
-Tastypie support should work on Tastypie 0.9.11 and newer.
-
-Django versions older than 1.5 require 'six' to be installed.
-Django versions older than 1.7 require 'south' to be installed.
-Django versions older than 1.8 require 'django-uuidfield' to be installed.
+Tastypie support should work on Tastypie 0.11.0 and newer.
 
 
 Setup
@@ -55,10 +51,7 @@ Note: If you are planning on running your project with `DEBUG=True`, then make s
 
 You can learn more about APNS certificates here: https://developer.apple.com/library/ios/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/Chapters/ProvisioningDevelopment.html
 
-Native Django migrations are supported on Django 1.7 and beyond. The app will automatically
-fall back to South on older versions, however you will also need the following setting::
-
-	SOUTH_MIGRATION_MODULES = {"push_notifications": "push_notifications.south_migrations"}
+Native Django migrations are in use. `manage.py migrate` will install and migrate all models.
 
 
 Settings list
@@ -164,4 +157,4 @@ When registered, the APIs will show up at <api_root>/device/apns and <api_root>/
 Python 3 support
 ----------------
 
-django-push-notifications is compatible with Python 3. Django 1.8 or higher is recommended.
+django-push-notifications is fully compatible with Python 3.

push_notifications/admin.py

@@ -1,20 +1,15 @@
 from django.contrib import admin
+from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext_lazy as _
 from .models import APNSDevice, GCMDevice, get_expired_tokens
 
 
-def _user__username():
-	try:
-		from django.contrib.auth import get_user_model
-	except ImportError:
-		# Django <1.5
-		return "user__username"
-	return "user__%s" % (get_user_model().USERNAME_FIELD)
+User = get_user_model()
 
 
 class DeviceAdmin(admin.ModelAdmin):
 	list_display = ("__unicode__", "device_id", "user", "active", "date_created")
-	search_fields = ("name", "device_id", _user__username())
+	search_fields = ("name", "device_id", "user__%s" % (User.USERNAME_FIELD))
 	list_filter = ("active", )
 	actions = ("send_message", "send_bulk_message", "prune_devices", "enable", "disable")
 

push_notifications/fields.py

@@ -3,21 +3,12 @@
 from django import forms
 from django.core.validators import RegexValidator
 from django.db import models, connection
+from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
-try:
-	from django.utils import six
-except ImportError:
-	import six
 
+__all__ = ["HexadecimalField", "HexIntegerField"]
 
-__all__ = ["HexadecimalField", "HexIntegerField", "UUIDField"]
-
-# Django <1.8 compatibility: UUIDField
-if hasattr(models, "UUIDField"):
-	UUIDField = models.UUIDField
-else:
-	from uuidfield import UUIDField
 
 hex_re = re.compile(r"^0x[0-9a-fA-F]+$")
 postgres_engines = [
@@ -81,9 +72,3 @@ def formfield(self, **kwargs):
 		defaults.update(kwargs)
 		# yes, that super call is right
 		return super(models.IntegerField, self).formfield(**defaults)
-
-try:
-	from south.modelsinspector import add_introspection_rules
-	add_introspection_rules([], ["^push_notifications\.fields\.HexIntegerField"])
-except ImportError:
-	pass

push_notifications/migrations/0001_initial.py

@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=255, null=True, verbose_name='Name', blank=True)),
                 ('active', models.BooleanField(default=True, help_text='Inactive devices will not be sent notifications', verbose_name='Is active')),
                 ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Creation date', null=True)),
-                ('device_id', push_notifications.fields.UUIDField(help_text=b'UDID / UIDevice.identifierForVendor()', max_length=32, null=True, verbose_name='Device ID', blank=True)),
+                ('device_id', models.UUIDField(help_text=b'UDID / UIDevice.identifierForVendor()', max_length=32, null=True, verbose_name='Device ID', blank=True)),
                 ('registration_id', models.CharField(unique=True, max_length=64, verbose_name='Registration ID')),
                 ('user', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True)),
             ],

push_notifications/models.py

@@ -1,18 +1,14 @@
 from django.conf import settings
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
-from .fields import HexIntegerField, UUIDField
-
-
-# Compatibility with custom user models, while keeping backwards-compatibility with <1.5
-AUTH_USER_MODEL = getattr(settings, "AUTH_USER_MODEL", "auth.User")
+from .fields import HexIntegerField
 
 
 class Device(models.Model):
 	name = models.CharField(max_length=255, verbose_name=_("Name"), blank=True, null=True)
 	active = models.BooleanField(verbose_name=_("Is active"), default=True,
 		help_text=_("Inactive devices will not be sent notifications"))
-	user = models.ForeignKey(AUTH_USER_MODEL, blank=True, null=True)
+	user = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True)
 	date_created = models.DateTimeField(verbose_name=_("Creation date"), auto_now_add=True, null=True)
 
 	class Meta:
@@ -27,7 +23,6 @@ def __unicode__(self):
 class GCMDeviceManager(models.Manager):
 	def get_queryset(self):
 		return GCMDeviceQuerySet(self.model)
-	get_query_set = get_queryset  # Django < 1.6 compatiblity
 
 
 class GCMDeviceQuerySet(models.query.QuerySet):
@@ -67,7 +62,6 @@ def send_message(self, message, **kwargs):
 class APNSDeviceManager(models.Manager):
 	def get_queryset(self):
 		return APNSDeviceQuerySet(self.model)
-	get_query_set = get_queryset  # Django < 1.6 compatiblity
 
 
 class APNSDeviceQuerySet(models.query.QuerySet):
@@ -79,7 +73,7 @@ def send_message(self, message, **kwargs):
 
 
 class APNSDevice(Device):
-	device_id = UUIDField(verbose_name=_("Device ID"), blank=True, null=True, db_index=True,
+	device_id = models.UUIDField(verbose_name=_("Device ID"), blank=True, null=True, db_index=True,
 		help_text="UDID / UIDevice.identifierForVendor()")
 	registration_id = models.CharField(verbose_name=_("Registration ID"), max_length=64, unique=True)