Merge pull request #215 from coddingtonbear/bump-django

Upgrade & drop Python & Django, upgrade TravisCI config

.travis.yml

@@ -1,42 +1,51 @@
+version: ~> 1.0
+os: linux
 language: python
-python: '3.5'
 
-env:
-  matrix:
-# sort by django version, next to by python version
-# Django 1.7 support Python 2.7, 3.4
-  - TOX_ENV=django17-py27
-  - TOX_ENV=django17-py34
-# Django 1.8 support Python 2.7, 3.4, 3.5
-  - TOX_ENV=django18-py27
-  - TOX_ENV=django18-py34
-  - TOX_ENV=django18-py35
-# Django 1.9 support Python 2.7, 3.4, 3.5
-  - TOX_ENV=django19-py27
-  - TOX_ENV=django19-py34
-  - TOX_ENV=django19-py35
-# Django 1.10 support Python 2.7, 3.4, 3.5
-  - TOX_ENV=django110-py27
-  - TOX_ENV=django110-py34
-  - TOX_ENV=django110-py35
-# Django 1.11 support all supported Python interpreter
-# Django 2.0 support Python 3.4, 3.5, 3.6
-  - TOX_ENV=django111-py34
-  - TOX_ENV=django111-py35
-  - TOX_ENV=django111-py36
+jobs:
+  # sort by django version, next to by python version
+  # Django 1.11 support all supported Python interpreter
+  - env: TOX_ENV=django111-py35
+    python: 3.5
+  - env: TOX_ENV=django111-py36
+    python: 3.6
+  # Django 2.0 support 3.5, 3.6
+  - env: TOX_ENV=django20-py35
+    python: 3.5
+  - env: TOX_ENV=django20-py36
+    python: 3.6
+
+  # Django 2.1 support Python 3.5, 3.6, 3.7
+  - env: TOX_ENV=django21-py35
+    python: 3.5
+  - env: TOX_ENV=django21-py36
+    python: 3.6
+  - env: TOX_ENV=django21-py37
+    python: 3.7
+  # Django 2.2 support Python 3.5, 3.6, 3.7
+  - env: TOX_ENV=django22-py35
+    python: 3.5
+  - env: TOX_ENV=django22-py36
+    python: 3.6
+  - env: TOX_ENV=django22-py37
+    python: 3.7
+  # Django 3.0 (beta) support Python 3.6, 3.7, 3.8
+  - env: TOX_ENV=django30-py36
+    python: 3.6
+  - env: TOX_ENV=django30-py37
+    python: 3.7
+  - env: TOX_ENV=django30-py38
+    python: 3.8
 
+env:
   global:
-  - secure: aswHU7pQroGM+GHoYlhXzzk2FYfqxXJORjqXPsbgoHAIu4Bssaj8+YAzIcdy3j9kSt4I8VBpjnn8H/wzQXki75JBZOosQrIeMK018+uR+ZMONBLqDYW/N7EJHLgZt9QXxQNKeZygrD4GN/Dc4gLHGvPQC/RfPuuHcnF0Liaahoo=
-  - secure: RZ6M6984P885GRoyx9n/WCCWGoFAzYpS8sZkXu3e/HK9oPXfaM2IEHjkq03jIC/FcWn/QMtFjOUBqQU94rnqdivFdFkeZHk1WUQgC0hztH3Qhh9zu2PNIrYUDpVD5dJqBpprWbSwFP8yNsJlP9A2RUubTlZblKHuaBhhiuNN+kU=
-  - secure: gsAAl/RaTodLJDHWOuHZWtooa9/psyXBONF7ElZOTki3WvH+KugtjuXn3pXBGbUhvGqd5qfgPqX7WQOFP9KTdkXBbkU20rCHLh3SV8V2vRkGFAFiGPBTFfSA83zFNMvmgEnTww4OzYsfs4wHTEyxBeQkggnB5bXEvqkFVrHBjuQ=
-  - secure: mMa7UUt+CQDB52fGM1T3oRL67OzQzRIc+BQCOqUEUhBV7p5g7Y1Hv6NTdVZTvK16x3DsP+5kFNd1v7rsTFw2qzP3hOxIv2BtMPuSzZdnN85Zd/nGwnztxzj/rqw7TMBaYvIdEZZbpRF/K0p0Xr6LJK2s9UkPXPUaLqly7kNi360=
+    - secure: aswHU7pQroGM+GHoYlhXzzk2FYfqxXJORjqXPsbgoHAIu4Bssaj8+YAzIcdy3j9kSt4I8VBpjnn8H/wzQXki75JBZOosQrIeMK018+uR+ZMONBLqDYW/N7EJHLgZt9QXxQNKeZygrD4GN/Dc4gLHGvPQC/RfPuuHcnF0Liaahoo=
+    - secure: RZ6M6984P885GRoyx9n/WCCWGoFAzYpS8sZkXu3e/HK9oPXfaM2IEHjkq03jIC/FcWn/QMtFjOUBqQU94rnqdivFdFkeZHk1WUQgC0hztH3Qhh9zu2PNIrYUDpVD5dJqBpprWbSwFP8yNsJlP9A2RUubTlZblKHuaBhhiuNN+kU=
+    - secure: gsAAl/RaTodLJDHWOuHZWtooa9/psyXBONF7ElZOTki3WvH+KugtjuXn3pXBGbUhvGqd5qfgPqX7WQOFP9KTdkXBbkU20rCHLh3SV8V2vRkGFAFiGPBTFfSA83zFNMvmgEnTww4OzYsfs4wHTEyxBeQkggnB5bXEvqkFVrHBjuQ=
+    - secure: mMa7UUt+CQDB52fGM1T3oRL67OzQzRIc+BQCOqUEUhBV7p5g7Y1Hv6NTdVZTvK16x3DsP+5kFNd1v7rsTFw2qzP3hOxIv2BtMPuSzZdnN85Zd/nGwnztxzj/rqw7TMBaYvIdEZZbpRF/K0p0Xr6LJK2s9UkPXPUaLqly7kNi360=
 
 install:
   - pip install tox
 
 script:
-  # Update Python 3.6 path - see bug https://github.com/travis-ci/travis-ci/issues/4990
-  - if [[ $TOX_ENV = *"py36"* ]]; then echo "Activated PY3.6"; source ~/virtualenv/python3.6/bin/activate; pip install tox; fi
   - tox -e $TOX_ENV
-
-sudo: false

django_mailbox/admin.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 """
 Model configuration in application ``django_mailbox`` for administration
@@ -10,7 +9,7 @@
 
 from django.conf import settings
 from django.contrib import admin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_mailbox.models import MessageAttachment, Message, Mailbox
 from django_mailbox.signals import message_received
@@ -74,7 +73,7 @@ def subject(self, msg):
     def envelope_headers(self, msg):
         email = msg.get_email_object()
         return '\n'.join(
-            [('%s: %s' % (h, v)) for h, v in email.items()]
+            [('{}: {}'.format(h, v)) for h, v in email.items()]
         )
 
     inlines = [

django_mailbox/apps.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class MailBoxConfig(AppConfig):

django_mailbox/migrations/0001_initial.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 

django_mailbox/migrations/0002_add_eml_to_message.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 

django_mailbox/migrations/0003_auto_20150409_0316.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 

django_mailbox/migrations/0004_bytestring_to_unicode.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 

django_mailbox/migrations/0005_auto_20160523_2240.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django_mailbox.utils
 

django_mailbox/migrations/0006_mailbox_last_polling.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-15 22:39
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 

django_mailbox/migrations/0007_auto_20180421_0026.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.10.7 on 2018-04-21 00:26
-from __future__ import unicode_literals
 
 from django.db import migrations