Merge branch 'master' of github.com:coddingtonbear/django-mailbox

.travis.yml

@@ -1,48 +1,42 @@
 language: python
-python:
+python: '3.5'
-- '2.7'
-- '3.4'
-- '3.5'
-- '3.6'
 
 env:
   matrix:
-  - DJANGO='>=1.7,<1.8'
+# sort by django version, next to by python version
-  - DJANGO='>=1.8,<1.9'
+# Django 1.7 support Python 2.7, 3.4
-  - DJANGO='>=1.9,<1.10'
+  - TOX_ENV=django17-py27
-  - DJANGO='>=1.10,<1.11'
+  - TOX_ENV=django17-py34
-  - DJANGO='>=1.11,<2.0'
+# Django 1.8 support Python 2.7, 3.4, 3.5
-  - DJANGO='>=2.0,<2.1'
+  - 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
+
   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=
-matrix:
+
-  exclude:
-# sort by django version, next to by python version
-# Django 1.7 support Python 2.7, 3.4
-  - env: DJANGO='>=1.7,<1.8'
-    python: '3.5'
-  - env: DJANGO='>=1.7,<1.8'
-    python: '3.6'
-# Django 1.8 support Python 2.7, 3.4, 3.5
-  - env: DJANGO='>=1.8,<1.9'
-    python: '3.6'
-# Django 1.9 support Python 2.7, 3.4, 3.5
-  - env: DJANGO='>=1.9,<1.10'
-    python: '3.6'
-# Django 1.10 support Python 2.7, 3.4, 3.5
-  - env: DJANGO='>=1.10,<1.11'
-    python: '3.6'
-# Django 1.11 support all supported Python interpreter
-# Django 2.0 support Python 3.4, 3.5, 3.6
-  - env: DJANGO='>=2.0,<2.1'
-    python: '2.7'
 install:
-  - pip install -q Django$DJANGO
+  - pip install tox
-  - pip install -r test_requirements.txt
+
-  - pip install -q -e .
 script:
-  - python manage.py test
+  # 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/migrations/0008_auto_20190219_1553.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.1.7 on 2019-02-19 14:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_mailbox', '0007_auto_20180421_0026'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='mailbox',
+            name='active',
+            field=models.BooleanField(blank=True, default=True, help_text='Check this e-mail inbox for new e-mail messages during polling cycles.  This checkbox does not have an effect upon whether mail is collected here when this mailbox receives mail from a pipe, and does not affect whether e-mail messages can be dispatched from this mailbox. ', verbose_name='Active'),
+        ),
+        migrations.AlterField(
+            model_name='message',
+            name='outgoing',
+            field=models.BooleanField(blank=True, default=False, verbose_name='Outgoing'),
+        ),
+    ]

docs/topics/mailbox_types.rst

@@ -100,7 +100,7 @@ For added security, Gmail supports using OAuth2 for authentication_.
 To handle the handshake and storing the credentials, use python-social-auth_.
 
 .. _authentication: https://developers.google.com/gmail/xoauth2_protocol
-.. _python-social-auth: http://psa.matiasaguirre.net/
+.. _python-social-auth: https://github.com/python-social-auth
 
 The Gmail Mailbox is also a regular IMAP mailbox,
 but the password you specify will be ignored if OAuth2 authentication succeeds.

tox.ini

@@ -10,6 +10,7 @@ envlist=
     py{34,35,36}-django20
 
 [testenv]
+passenv=EMAIL_IMAP_SERVER EMAIL_ACCOUNT EMAIL_PASSWORD EMAIL_SMTP_SERVER
 deps=
     django17: django>=1.7,<1.8
     django18: django>=1.8,<1.9
@@ -23,7 +24,7 @@ commands=
     django110: python {toxinidir}/manage.py makemigrations --check --dry-run
     django111: python {toxinidir}/manage.py makemigrations --check --dry-run
     django20: python {toxinidir}/manage.py makemigrations --check --dry-run
-    python manage.py test {posargs}
+    python manage.py test -v2 {posargs}
 
 [testenv:flake8]
 deps=flake8