Version 0.4.1: preliminary Django 3.0 support.

.isort.cfg

@@ -2,6 +2,7 @@
 line_length = 120
 force_sort_within_sections = true
 multi_line_output = 5
+known_six=six
 known_django=django
-sections=FUTURE,STDLIB,THIRDPARTY,DJANGO,FIRSTPARTY,LOCALFOLDER
+sections=FUTURE,STDLIB,SIX,THIRDPARTY,DJANGO,FIRSTPARTY,LOCALFOLDER
 lines_after_imports = 2

CHANGES.rst

@@ -1,3 +1,9 @@
+v0.4.1 - September 12, 2019 - Preliminary Django 3.0 support
+------------------------------------------------------------
+
+Removed dependencies on Python 2 compatibility shims in Django < 3.0.
+
+
 v0.4.0 - August 26, 2019 - Housekeeping
 ---------------------------------------
 

docs/source/conf.py

@@ -78,7 +78,7 @@
 # The short X.Y version.
 version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.0'
+release = '0.4.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='django-agent-trust',
-    version='0.4.0',
+    version='0.4.1',
     description="A framework for managing agent trust, such as public vs. private computers.",
     author="Peter Sagerson",
     author_email='[email protected]',
@@ -20,6 +20,7 @@
     packages=find_packages(where='src'),
     install_requires=[
         'django >= 1.11',
+        'six >= 1.10.0',
     ],
 
     classifiers=[

src/django_agent_trust/conf.py

@@ -1,7 +1,8 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+from six import iteritems
+
 import django.conf
-from django.utils.six import iteritems
 
 
 class Settings(object):

src/django_agent_trust/models.py

@@ -3,9 +3,10 @@
 from datetime import datetime, timedelta
 from time import mktime
 
+from six import python_2_unicode_compatible
+
 import django.conf
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 
 from .conf import settings
 

test/test_project/tests.py

@@ -2,6 +2,8 @@
 
 from datetime import timedelta
 
+import six
+
 import django
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser
@@ -10,7 +12,6 @@
 from django.http import HttpResponse
 from django.test import TestCase
 from django.test.client import Client, RequestFactory
-from django.utils import six
 import django.utils.timezone
 
 from django_agent_trust.conf import settings

tox.ini

@@ -3,6 +3,7 @@ envlist = static
           py{27,37}-django111
           py35-django21
           py{36,37}-django22
+          py37-django30
           coverage
 
 [testenv]
@@ -12,6 +13,7 @@ deps = py27: mock
        django111: Django==1.11.*
        django21: Django==2.1.*
        django22: Django==2.2.*
+       django30: Django~=3.0a1
 commands = {envbindir}/django-admin test test_project
 
 [testenv:static]