Fix few test coverage and deprecation issues

Author: joehybird

.travis.yml

@@ -1,18 +1,24 @@
 language: python
-dist: xenial
+dist: bionic
 sudo: true
 services:
   - postgresql
 python:
   - 2.7
   - 3.5
   - 3.6
-jobs:
-  - include:
-    - python: 3.6
-      env: TOXENV=flake8
+  - 3.7
+  - 3.8
 install:
   - pip install tox
   - pip install -q tox-travis
 script:
     - tox
+
+stages:
+  - lint
+  - test
+
+jobs:
+  include:
+    - { stage: lint, env: TOXENV=flake8, python: 3.8 }

demo/demoproject/compat.py

@@ -0,0 +1,4 @@
+try:
+    from django.urls import reverse  # noqa
+except ImportError:
+    from django.core.urlresolvers import reverse  # noqa

demo/demoproject/filter/tests.py

@@ -1,5 +1,6 @@
 from django.test import TestCase
-from django.core.urlresolvers import reverse
+
+from demoproject.compat import reverse
 
 
 class FilteredListView(TestCase):

demo/demoproject/settings.py

@@ -1,4 +1,8 @@
 """Django settings for django-generic-filters demo project."""
+
+from distutils.version import StrictVersion
+from django.utils.version import get_version
+
 from os import environ
 from os.path import abspath, dirname, join
 
@@ -75,13 +79,22 @@
 
 
 # Default middlewares. You may alter the list later.
-MIDDLEWARE_CLASSES = [
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-]
+if StrictVersion(get_version()) >= StrictVersion('1.10'):
+    MIDDLEWARE = [
+        'django.middleware.common.CommonMiddleware',
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+    ]
+else:
+    MIDDLEWARE_CLASSES = [
+        'django.middleware.common.CommonMiddleware',
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+    ]
 
 # Development configuration.
 DEBUG = True

demo/demoproject/tests.py

@@ -1,8 +1,9 @@
 # coding=utf8
 """Test suite for django-generic-filters."""
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 
+from demoproject.compat import reverse
+
 
 class HomeViewTestCase(TestCase):
     """Test homepage."""

django_genericfilters/tests/test_templatetags.py

@@ -1,17 +1,14 @@
 import unittest
 
-from django.template.base import TOKEN_TEXT
-from django.template.base import Parser
-from django.template.base import Token
-from django.template.base import Variable
+from django import forms
+from django.template.base import TOKEN_TEXT, Parser, Token, Variable
 
 import mock
 
-from django_genericfilters.templatetags.updateurl import token_kwargs
-from django_genericfilters.templatetags.updateurl import token_value
-from django_genericfilters.templatetags.updateurl import \
-    tag_update_query_string
-from django_genericfilters.templatetags.updateurl import update_query_string
+from django_genericfilters.templatetags.updateurl import (
+    token_kwargs, token_value, tag_update_query_string, update_query_string
+)
+from django_genericfilters.templatetags.utils import is_checkbox
 
 
 class TemplateTagTestCase(unittest.TestCase):
@@ -56,3 +53,18 @@ def test_tag_update_query_string(self):
         self.assertEqual(
             node.render({'request': request, 'page': 'page', 'num_page': 2}),
             u'/fake?page=2')
+
+    def test_is_checkbox(self):
+        class MockForm(forms.Form):
+            a = forms.CharField()
+            b = forms.BooleanField()
+
+        form = MockForm()
+
+        boundfield_a, boundfield_b = form.visible_fields()
+
+        self.assertEqual("a", boundfield_a.name)
+        self.assertFalse(is_checkbox(boundfield_a))
+
+        self.assertEqual("b", boundfield_b.name)
+        self.assertTrue(is_checkbox(boundfield_b))

django_genericfilters/tests/test_views.py

@@ -55,11 +55,13 @@ class QueryModel(models.Model):
         """
         Define a dummy model for this test case
         """
-        people = models.ForeignKey(ParentModel)
+        people = models.ForeignKey(ParentModel, on_delete=models.CASCADE)
         city = models.CharField(max_length=250)
         country = models.CharField(max_length=250)
         organization = models.CharField(max_length=250)
-        status = models.ForeignKey(StatusModel, null=True)
+        status = models.ForeignKey(
+            StatusModel, null=True, on_delete=models.CASCADE
+        )
 
     class Form(FilteredForm):
 

setup.py

@@ -15,7 +15,7 @@ def read_relative_file(filename):
 VERSION = read_relative_file('VERSION')
 PACKAGES = ['django_genericfilters']
 REQUIRES = [
-    'Django>=1.8,<1.12',
+    'Django>=1.8,<3.1',
     'bunch',
 ]
 
@@ -29,6 +29,8 @@ def read_relative_file(filename):
                        'License :: OSI Approved :: BSD License',
                        'Programming Language :: Python :: 2',
                        'Programming Language :: Python :: 2.7',
+                       'Programming Language :: Python :: 3',
+                       'Programming Language :: Python :: 3.6',
                        'Framework :: Django',
                        ],
           keywords='class-based view, generic view, filters',

tox.ini

@@ -6,7 +6,7 @@
 [tox]
 envlist =
     py{27,34,35}-django{18,19,110,111},
-    py{36}-django{20,21,22},
+    py{36,37,38}-django{20,21,22,30},
     flake8
 
 [testenv]
@@ -15,6 +15,8 @@ basepython =
     py34: python3.4
     py35: python3.5
     py36: python3.6
+    py37: python3.7
+    py38: python3.8
 deps =
     coverage
     psycopg2>=2.5.4
@@ -25,18 +27,19 @@ deps =
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
     django22: Django>=2.2,<3.0
+    django30: Django>=3.0,<3.1
 commands =
     pip install -e ./
     pip install -e demo
-    python -Wd {envbindir}/coverage run --source=django_genericfilters {envbindir}/demo test {posargs:demo django_genericfilters}
+    python -Wd {envbindir}/coverage run --branch --source=django_genericfilters {envbindir}/demo test {posargs:demoproject django_genericfilters}
     coverage report -m
 passenv =
     PYTHONPATH
     DJANGO_DB_USER
     DJANGO_DB_PASSWORD
 
 [testenv:flake8]
-basepython = python2.7
+basepython = python3.8
 commands =
     flake8 demo
     flake8 django_genericfilters