From f55014392b4927ddc161bf7f1d772626f2d7e0db Mon Sep 17 00:00:00 2001 From: Peter Sagerson Date: Thu, 12 Sep 2019 14:42:41 -0700 Subject: [PATCH] Version 0.4.1: preliminary Django 3.0 support. --- .isort.cfg | 3 ++- CHANGES.rst | 6 ++++++ docs/source/conf.py | 2 +- setup.py | 3 ++- src/django_agent_trust/conf.py | 3 ++- src/django_agent_trust/models.py | 3 ++- test/test_project/tests.py | 3 ++- tox.ini | 2 ++ 8 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.isort.cfg b/.isort.cfg index 52394ae..391299a 100644 --- a/.isort.cfg +++ b/.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 diff --git a/CHANGES.rst b/CHANGES.rst index 0bb7869..95845cd 100644 --- a/CHANGES.rst +++ b/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 --------------------------------------- diff --git a/docs/source/conf.py b/docs/source/conf.py index a37e202..5a9de32 100644 --- a/docs/source/conf.py +++ b/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. diff --git a/setup.py b/setup.py index 93d41e1..43eace4 100644 --- a/setup.py +++ b/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='psagers@ignorare.net', @@ -20,6 +20,7 @@ packages=find_packages(where='src'), install_requires=[ 'django >= 1.11', + 'six >= 1.10.0', ], classifiers=[ diff --git a/src/django_agent_trust/conf.py b/src/django_agent_trust/conf.py index 0de105d..1798819 100644 --- a/src/django_agent_trust/conf.py +++ b/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): diff --git a/src/django_agent_trust/models.py b/src/django_agent_trust/models.py index fdfa87e..6f76fd3 100644 --- a/src/django_agent_trust/models.py +++ b/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 diff --git a/test/test_project/tests.py b/test/test_project/tests.py index e18ed20..1cb0fee 100644 --- a/test/test_project/tests.py +++ b/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 diff --git a/tox.ini b/tox.ini index d01ac06..1815879 100644 --- a/tox.ini +++ b/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]