modernized tests

.travis.yml

@@ -1,5 +1,8 @@
 sudo: false
-cache: pip
+cache:
+  directories:
+    - $HOME/.wheels
+
 language: python
 python: 3.6
 dist: xenial
@@ -8,16 +11,36 @@ env:
     - TOX_ENV=pypy-django11
     - TOX_ENV=py27-django11
     - TOX_ENV=py35-django11
-    - TOX_ENV=py35-django20
+    - TOX_ENV=py35-django22
+    - TOX_ENV=py35-django30
     - TOX_ENV=py36-django11
-    - TOX_ENV=py36-django20
+    - TOX_ENV=py36-django22
+    - TOX_ENV=py36-django30
+    - TOX_ENV=py37-django11
+    - TOX_ENV=py37-django22
+    - TOX_ENV=py37-django30
+    - TOX_ENV=py38-django11
+    - TOX_ENV=py38-django22
+    - TOX_ENV=py38-django30
+    - TOX_ENV=py39-django11
+    - TOX_ENV=py39-django22
+    - TOX_ENV=py39-django30
     - TOX_ENV=flake8
     - TOX_ENV=docs
     - TOX_ENV=coveralls
 
+    global:
+        - PIP_WHEEL_DIR=$HOME/.wheels
+        - PIP_FIND_LINKS=file://$PIP_WHEEL_DIR
+        -
 install:
     - pip install tox
 
 script:
     tox -e $TOX_ENV
 
+notifications:
+  email:
+    on_success: never
+    on_failure: change
+

pytest.ini

@@ -1,4 +1,7 @@
 [pytest]
+markers =
+    pep8: PEP8
+
 python_files =
     django_utils/*.py
     tests/*.py

tests/settings.py

@@ -96,7 +96,7 @@
     #     'django.template.loaders.eggs.Loader',
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',

tests/test_choices.py

@@ -1,6 +1,10 @@
 from django.db import models
 from django_utils import choices
-from django.utils.translation import ugettext_lazy as _
+
+try:
+    from django.utils.translation import gettext_lazy as _
+except ImportError:
+    from django.utils.translation import ugettext_lazy as _
 
 
 class TranslatedHuman(models.Model):

tox.ini

@@ -1,8 +1,11 @@
 [tox]
 envlist = 
     py{py,27}-django11,
-    py35-django{11,20},
-    py36-django{11,20},
+    py35-django{11,22,30},
+    py36-django{11,22,30},
+    py37-django{11,22,30},
+    py38-django{11,22,30},
+    py39-django{11,22,30},
     flake8,
     docs
 
@@ -12,13 +15,17 @@ usedevelop = True
 [testenv]
 deps =
     django11: Django<2.0
-    django20: Django>=2.0,<2.1
+    django22: Django>=2.2,<2.3
+    django30: Django>=3.0,<3.1
     -r{toxinidir}/tests/requirements.txt
 
 envlist = 
     py{py,27}-django11,
-    py35-django{11,20},
-    py36-django{11,20},
+    py35-django{11,22,30},
+    py36-django{11,22,30},
+    py37-django{11,22,30},
+    py38-django{11,22,30},
+    py39-django{11,22,30},
 
 commands =
     python setup.py test
@@ -49,6 +56,6 @@ commands =
     coveralls
 
 deps =
-    Django>=2.0,<2.1
+    Django>=3.0,<3.1
     -r{toxinidir}/tests/requirements.txt
     coveralls