M impersonate/tests.py +4 -2
@@ 20,6 20,7 @@
is_staff = False
'''
import datetime
+import sys
from collections import namedtuple
from distutils.version import LooseVersion
from unittest.mock import patch, PropertyMock
@@ 27,7 28,7 @@ from unittest.mock import patch, Propert
import django
from django.test import TestCase
from django.http import HttpResponse
-from django.utils import six, timezone
+from django.utils import timezone
from django.conf.urls import url, include
from django.contrib.auth import get_user_model
from django.test.utils import override_settings
@@ 95,7 96,8 @@ def test_qs(request):
return User.objects.all()
-if six.PY3:
+PYTHON_VERSION = sys.version_info
+if PYTHON_VERSION[0] == 3:
# Temporary until factory_boy gets Py3k support
class UserFactory(object):
@staticmethod
M setup.py +7 -0
@@ 44,12 44,19 @@ setup(
'License :: OSI Approved :: BSD License',
'Natural Language :: English',
'Operating System :: OS Independent',
+ 'Framework :: Django',
+ 'Framework :: Django :: 1.11',
+ 'Framework :: Django :: 2.1',
+ 'Framework :: Django :: 2.2',
+ 'Framework :: Django :: 3.0',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
'Environment :: Web Environment',
],
)
M tox.ini +7 -33
@@ 1,38 1,12 @@
[tox]
downloadcache = {toxworkdir}/cache/
-envlist = py3.7-django2.2,py3.7-django2.1,py3.6-django2.2,py3.6-django2.1,py3.7-django2.0,py3.6-django2.0,py3.7-django1.11,py3.6-django1.11
+envlist = py{36,37,38}-django{1.11,2.0,2.1,2.2,3.0}
[testenv]
commands = {envpython} runtests.py
-
-[testenv:py3.7-django2.2]
-basepython = python3.7
-deps = django==2.2
-
-[testenv:py3.7-django2.1]
-basepython = python3.7
-deps = django==2.1.5
-
-[testenv:py3.6-django2.2]
-basepython = python3.6
-deps = django==2.2
-
-[testenv:py3.6-django2.1]
-basepython = python3.6
-deps = django==2.1.5
-
-[testenv:py3.7-django2.0]
-basepython = python3.7
-deps = django==2.0.10
-
-[testenv:py3.6-django2.0]
-basepython = python3.6
-deps = django==2.0.10
-
-[testenv:py3.7-django1.11]
-basepython = python3.7
-deps = django==1.11.18
-
-[testenv:py3.6-django1.11]
-basepython = python3.6
-deps = django==1.11.18
+deps =
+ django1.11: django>=1.11,<2.0
+ django2.0: django>=2.0,<2.1
+ django2.1: django>=2.1,<2.2
+ django2.2: django>=2.2,<3.0
+ django3.0: django>=3.0,<3.1