Merge pull request #51 from rpkilby/django-update

Update Django version support

Author: Ryan P Kilby

.travis.yml

@@ -1,20 +1,25 @@
 language: python
+
+sudo: false
+
 python:
   - "2.7"
   - "3.2"
   - "3.3"
   - "3.4"
   - "3.5"
 env:
-  - DJANGO="Django>=1.7,<1.8"
   - DJANGO="Django>=1.8,<1.9"
+  - DJANGO="Django>=1.9,<1.10"
 install:
   - travis_retry pip install -q $DJANGO
   - python setup.py install
 script: python manage.py test rest_framework_filters
 
 matrix:
   exclude:
-    - python: "3.5"
-      env: DJANGO="Django>=1.7,<1.8"
+    - python: "3.2"
+      env: DJANGO="Django>=1.9,<1.10"
+    - python: "3.3"
+      env: DJANGO="Django>=1.9,<1.10"
   fast_finish: true

README.rst

@@ -21,7 +21,7 @@ Requirements
 ------------
 
 * Python 2.7+
-* Django 1.7.10+
+* Django 1.8+
 * Django REST framework 3.0+
 
 Usage

rest_framework_filters/filterset.py

@@ -4,13 +4,9 @@
 from collections import OrderedDict
 import copy
 
-from django.db.models.constants import LOOKUP_SEP
 from django.db import models
-try:
-    from django.db.models.related import RelatedObject as ForeignObjectRel
-except ImportError:  # pragma: nocover
-    # Django >= 1.8 replaces RelatedObject with ForeignObjectRel
-    from django.db.models.fields.related import ForeignObjectRel
+from django.db.models.constants import LOOKUP_SEP
+from django.db.models.fields.related import ForeignObjectRel
 from django.utils import six
 
 import django_filters

tests/test_filterset.py

@@ -4,11 +4,9 @@
 
 import datetime
 
-from django.utils.dateparse import parse_time, parse_datetime
-
-import django
 from django.test import TestCase, override_settings
 from django.contrib.auth.models import User
+from django.utils.dateparse import parse_time, parse_datetime
 
 from .models import (
     Note, Post, Cover, Page, A, B, C, Person, Tag, BlogPost,
@@ -49,17 +47,8 @@ def add_timedelta(time, timedelta):
 
 class TestFilterSets(TestCase):
 
-    if django.VERSION >= (1, 8):
-        @classmethod
-        def setUpTestData(cls):
-            cls.generateTestData()
-
-    else:
-        def setUp(self):
-            self.generateTestData()
-
     @classmethod
-    def generateTestData(cls):
+    def setUpTestData(cls):
         #######################
         # Create users
         #######################
@@ -326,17 +315,8 @@ def test_get_filterset_subset(self):
 
 class DatetimeTests(TestCase):
 
-    if django.VERSION >= (1, 8):
-        @classmethod
-        def setUpTestData(cls):
-            cls.generateTestData()
-
-    else:
-        def setUp(self):
-            self.generateTestData()
-
     @classmethod
-    def generateTestData(cls):
+    def setUpTestData(cls):
         john = Person.objects.create(name="John")
 
         # Created at least one second apart
@@ -428,17 +408,8 @@ class Meta:
 
 class FilterOverrideTests(TestCase):
 
-    if django.VERSION >= (1, 8):
-        @classmethod
-        def setUpTestData(cls):
-            cls.generateTestData()
-
-    else:
-        def setUp(self):
-            self.generateTestData()
-
     @classmethod
-    def generateTestData(cls):
+    def setUpTestData(cls):
         john = Person.objects.create(name="John")
         Person.objects.create(name="Mark", best_friend=john)
 
@@ -519,17 +490,8 @@ def test_inset_char_filter(self):
 
 class FilterExclusionTests(TestCase):
 
-    if django.VERSION >= (1, 8):
-        @classmethod
-        def setUpTestData(cls):
-            cls.generateTestData()
-
-    else:
-        def setUp(self):
-            self.generateTestData()
-
     @classmethod
-    def generateTestData(cls):
+    def setUpTestData(cls):
         t1 = Tag.objects.create(name='Tag 1')
         t2 = Tag.objects.create(name='Tag 2')
         t3 = Tag.objects.create(name='Something else entirely')