Skip to content

Commit 2b2b7d6

Browse files
committed
Modernize syntax, drop Python EOL, drop drop Django<1.11, upgrade TravisCI config to v1, add Python 3.8 & Django 3.x
1 parent f9b0a27 commit 2b2b7d6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+228
-349
lines changed

.travis.yml

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,51 @@
1+
version: ~> 1.0
2+
os: linux
13
language: python
2-
python: '3.5'
34

4-
env:
5-
matrix:
6-
# sort by django version, next to by python version
7-
# Django 1.7 support Python 2.7, 3.4
8-
- TOX_ENV=django17-py27
9-
- TOX_ENV=django17-py34
10-
# Django 1.8 support Python 2.7, 3.4, 3.5
11-
- TOX_ENV=django18-py27
12-
- TOX_ENV=django18-py34
13-
- TOX_ENV=django18-py35
14-
# Django 1.9 support Python 2.7, 3.4, 3.5
15-
- TOX_ENV=django19-py27
16-
- TOX_ENV=django19-py34
17-
- TOX_ENV=django19-py35
18-
# Django 1.10 support Python 2.7, 3.4, 3.5
19-
- TOX_ENV=django110-py27
20-
- TOX_ENV=django110-py34
21-
- TOX_ENV=django110-py35
22-
# Django 1.11 support all supported Python interpreter
23-
# Django 2.0 support Python 3.4, 3.5, 3.6
24-
- TOX_ENV=django111-py34
25-
- TOX_ENV=django111-py35
26-
- TOX_ENV=django111-py36
5+
jobs:
6+
# sort by django version, next to by python version
7+
# Django 1.11 support all supported Python interpreter
8+
- env: TOX_ENV=django111-py35
9+
python: 3.5
10+
- env: TOX_ENV=django111-py36
11+
python: 3.6
12+
# Django 2.0 support 3.5, 3.6
13+
- env: TOX_ENV=django20-py35
14+
python: 3.5
15+
- env: TOX_ENV=django20-py36
16+
python: 3.6
17+
18+
# Django 2.1 support Python 3.5, 3.6, 3.7
19+
- env: TOX_ENV=django21-py35
20+
python: 3.5
21+
- env: TOX_ENV=django21-py36
22+
python: 3.6
23+
- env: TOX_ENV=django21-py37
24+
python: 3.7
25+
# Django 2.2 support Python 3.5, 3.6, 3.7
26+
- env: TOX_ENV=django22-py35
27+
python: 3.5
28+
- env: TOX_ENV=django22-py36
29+
python: 3.6
30+
- env: TOX_ENV=django22-py37
31+
python: 3.7
32+
# Django 3.0 (beta) support Python 3.6, 3.7, 3.8
33+
- env: TOX_ENV=django30-py36
34+
python: 3.6
35+
- env: TOX_ENV=django30-py37
36+
python: 3.7
37+
- env: TOX_ENV=django30-py38
38+
python: 3.8
2739

40+
env:
2841
global:
29-
- secure: aswHU7pQroGM+GHoYlhXzzk2FYfqxXJORjqXPsbgoHAIu4Bssaj8+YAzIcdy3j9kSt4I8VBpjnn8H/wzQXki75JBZOosQrIeMK018+uR+ZMONBLqDYW/N7EJHLgZt9QXxQNKeZygrD4GN/Dc4gLHGvPQC/RfPuuHcnF0Liaahoo=
30-
- secure: RZ6M6984P885GRoyx9n/WCCWGoFAzYpS8sZkXu3e/HK9oPXfaM2IEHjkq03jIC/FcWn/QMtFjOUBqQU94rnqdivFdFkeZHk1WUQgC0hztH3Qhh9zu2PNIrYUDpVD5dJqBpprWbSwFP8yNsJlP9A2RUubTlZblKHuaBhhiuNN+kU=
31-
- secure: gsAAl/RaTodLJDHWOuHZWtooa9/psyXBONF7ElZOTki3WvH+KugtjuXn3pXBGbUhvGqd5qfgPqX7WQOFP9KTdkXBbkU20rCHLh3SV8V2vRkGFAFiGPBTFfSA83zFNMvmgEnTww4OzYsfs4wHTEyxBeQkggnB5bXEvqkFVrHBjuQ=
32-
- secure: mMa7UUt+CQDB52fGM1T3oRL67OzQzRIc+BQCOqUEUhBV7p5g7Y1Hv6NTdVZTvK16x3DsP+5kFNd1v7rsTFw2qzP3hOxIv2BtMPuSzZdnN85Zd/nGwnztxzj/rqw7TMBaYvIdEZZbpRF/K0p0Xr6LJK2s9UkPXPUaLqly7kNi360=
42+
- secure: aswHU7pQroGM+GHoYlhXzzk2FYfqxXJORjqXPsbgoHAIu4Bssaj8+YAzIcdy3j9kSt4I8VBpjnn8H/wzQXki75JBZOosQrIeMK018+uR+ZMONBLqDYW/N7EJHLgZt9QXxQNKeZygrD4GN/Dc4gLHGvPQC/RfPuuHcnF0Liaahoo=
43+
- secure: RZ6M6984P885GRoyx9n/WCCWGoFAzYpS8sZkXu3e/HK9oPXfaM2IEHjkq03jIC/FcWn/QMtFjOUBqQU94rnqdivFdFkeZHk1WUQgC0hztH3Qhh9zu2PNIrYUDpVD5dJqBpprWbSwFP8yNsJlP9A2RUubTlZblKHuaBhhiuNN+kU=
44+
- secure: gsAAl/RaTodLJDHWOuHZWtooa9/psyXBONF7ElZOTki3WvH+KugtjuXn3pXBGbUhvGqd5qfgPqX7WQOFP9KTdkXBbkU20rCHLh3SV8V2vRkGFAFiGPBTFfSA83zFNMvmgEnTww4OzYsfs4wHTEyxBeQkggnB5bXEvqkFVrHBjuQ=
45+
- secure: mMa7UUt+CQDB52fGM1T3oRL67OzQzRIc+BQCOqUEUhBV7p5g7Y1Hv6NTdVZTvK16x3DsP+5kFNd1v7rsTFw2qzP3hOxIv2BtMPuSzZdnN85Zd/nGwnztxzj/rqw7TMBaYvIdEZZbpRF/K0p0Xr6LJK2s9UkPXPUaLqly7kNi360=
3346

3447
install:
3548
- pip install tox
3649

3750
script:
38-
# Update Python 3.6 path - see bug https://github.com/travis-ci/travis-ci/issues/4990
39-
- if [[ $TOX_ENV = *"py36"* ]]; then echo "Activated PY3.6"; source ~/virtualenv/python3.6/bin/activate; pip install tox; fi
4051
- tox -e $TOX_ENV
41-
42-
sudo: false

django_mailbox/admin.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env python
2-
# -*- coding: utf-8 -*-
32

43
"""
54
Model configuration in application ``django_mailbox`` for administration
@@ -10,7 +9,7 @@
109

1110
from django.conf import settings
1211
from django.contrib import admin
13-
from django.utils.translation import ugettext_lazy as _
12+
from django.utils.translation import gettext_lazy as _
1413

1514
from django_mailbox.models import MessageAttachment, Message, Mailbox
1615
from django_mailbox.signals import message_received
@@ -74,7 +73,7 @@ def subject(self, msg):
7473
def envelope_headers(self, msg):
7574
email = msg.get_email_object()
7675
return '\n'.join(
77-
[('%s: %s' % (h, v)) for h, v in email.items()]
76+
[('{}: {}'.format(h, v)) for h, v in email.items()]
7877
)
7978

8079
inlines = [

django_mailbox/apps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from django.apps import AppConfig
2-
from django.utils.translation import ugettext_lazy as _
2+
from django.utils.translation import gettext_lazy as _
33

44

55
class MailBoxConfig(AppConfig):

django_mailbox/migrations/0001_initial.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# -*- coding: utf-8 -*-
2-
from __future__ import unicode_literals
3-
41
from django.db import models, migrations
52

63

django_mailbox/migrations/0002_add_eml_to_message.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# -*- coding: utf-8 -*-
2-
from __future__ import unicode_literals
3-
41
from django.db import models, migrations
52

63

django_mailbox/migrations/0003_auto_20150409_0316.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# -*- coding: utf-8 -*-
2-
from __future__ import unicode_literals
3-
41
from django.db import models, migrations
52

63

django_mailbox/migrations/0004_bytestring_to_unicode.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# -*- coding: utf-8 -*-
2-
from __future__ import unicode_literals
3-
41
from django.db import models, migrations
52

63

django_mailbox/migrations/0005_auto_20160523_2240.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# -*- coding: utf-8 -*-
2-
from __future__ import unicode_literals
3-
41
from django.db import migrations, models
52
import django_mailbox.utils
63

django_mailbox/migrations/0006_mailbox_last_polling.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# -*- coding: utf-8 -*-
21
# Generated by Django 1.9.8 on 2016-08-15 22:39
3-
from __future__ import unicode_literals
42

53
from django.db import migrations, models
64

django_mailbox/migrations/0007_auto_20180421_0026.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# -*- coding: utf-8 -*-
21
# Generated by Django 1.10.7 on 2018-04-21 00:26
3-
from __future__ import unicode_literals
42

53
from django.db import migrations
64

0 commit comments

Comments
 (0)