django 2.2 compat

dev-requirements.in

@@ -1,4 +1,4 @@
--r requirements.in
+-r requirements.txt
 ansible
 flake8
 mock

dev-requirements.txt

@@ -6,63 +6,63 @@
 #
 ansible==2.8.2
 asn1crypto==0.24.0        # via cryptography
-babel==2.7.0              # via prices
-blinker==1.4              # via sentry-sdk
-boto3==1.9.190            # via django-amazon-ses
-botocore==1.12.190        # via boto3, s3transfer
+babel==2.7.0
+blinker==1.4
+boto3==1.9.190
+botocore==1.12.190
 braintree==3.29.2
-certifi==2018.10.15       # via requests, sentry-sdk
+certifi==2018.10.15
 cffi==1.12.3              # via cryptography
-chardet==3.0.4            # via requests
-click==6.6                # via flask, pip-tools
+chardet==3.0.4
+click==6.6
 cryptography==2.7         # via ansible
 django-amazon-ses==2.1.1
 django-bootstrap3==9.0.0
-django-registration-redux==1.9
-django==1.11.22
+django-registration-redux==2.7
+django==1.11.28
 djmail==0.13.0
 dnspython==1.14.0
 docopt==0.6.2
-docutils==0.14            # via botocore
+docutils==0.14
 entrypoints==0.3          # via flake8
 enum34==1.1.6
 flake8==3.7.8
-flask==0.12.3
+flask==1.1.1
 future==0.17.1
 futures==3.0.5
-gevent==1.4.0             # via gunicorn
+gevent==1.4.0
 google-api-python-client==1.6.7
 google-measurement-protocol==1.0.0
-greenlet==0.4.15          # via gevent
+greenlet==0.4.15
 gunicorn[gevent]==19.9.0
-httplib2==0.9.2           # via google-api-python-client, oauth2client
-idna==2.7                 # via requests
-itsdangerous==0.24        # via flask
-jinja2==2.10.1            # via ansible, flask
-jmespath==0.9.4           # via boto3, botocore
+httplib2==0.9.2
+idna==2.7
+itsdangerous==0.24
+jinja2==2.10.1
+jmespath==0.9.4
 jsonpickle==1.2
-markupsafe==0.23          # via jinja2
+markupsafe==0.23
 mccabe==0.6.1             # via flake8
 mock==1.3.0
-oauth2client==4.1.0
+git+https://github.com/simon-weber/oauth2client.git@4.1.4-rc.1#egg=oauth2client==4.1.4-rc.1
 pbr==1.10.0               # via mock
 pip-tools==4.3.0
-prices==1.0.0             # via google-measurement-protocol
-pyasn1-modules==0.0.8     # via oauth2client
-pyasn1==0.1.9             # via oauth2client, pyasn1-modules, rsa
+prices==1.0.0
+pyasn1-modules==0.0.8
+pyasn1==0.1.9
 pycodestyle==2.5.0        # via flake8
 pycparser==2.19           # via cffi
 pyflakes==2.1.1           # via flake8
-python-dateutil==2.8.0    # via botocore
-pytz==2018.9              # via babel, django
+python-dateutil==2.8.0
+pytz==2018.9
 pyyaml==3.12              # via ansible
 requests==2.20.1
-rsa==3.4.2                # via oauth2client
-s3transfer==0.2.1         # via boto3
+rsa==3.4.2
+s3transfer==0.2.1
 sentry-sdk[flask]==0.10.2
-six==1.10.0               # via cryptography, google-api-python-client, mock, oauth2client, pip-tools, python-dateutil
+six==1.10.0
 git+https://github.com/simon-weber/SleekXMPP.git@1.5.0rc1#egg=sleekxmpp==1.5.0rc1
-typing==3.7.4.1           # via google-measurement-protocol, prices
-uritemplate==3.0.0        # via google-api-python-client
-urllib3==1.24.1           # via botocore, requests, sentry-sdk
-werkzeug==0.11.11         # via flask
+typing==3.7.4.1
+uritemplate==3.0.0
+urllib3==1.24.1
+werkzeug==0.15.5

gchatautorespond/apps/autorespond/migrations/0001_initial.py

@@ -26,17 +26,17 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('credentials', CredentialsField(null=True)),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
         ),
         migrations.AddField(
             model_name='forward',
             name='credentials',
-            field=models.ForeignKey(to='autorespond.GoogleCredential'),
+            field=models.ForeignKey(to='autorespond.GoogleCredential', on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='forward',
             name='user',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
         ),
     ]

gchatautorespond/apps/autorespond/migrations/0004_auto_20150603_0328.py

@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='forward',
             name='credentials',
-            field=models.OneToOneField(to='autorespond.GoogleCredential'),
+            field=models.OneToOneField(to='autorespond.GoogleCredential', on_delete=models.CASCADE),
         ),
     ]

gchatautorespond/apps/autorespond/migrations/0007_auto_20151017_2041.py

@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='autoresponse',
             name='credentials',
-            field=models.OneToOneField(verbose_name=b'autorespond email', to='autorespond.GoogleCredential'),
+            field=models.OneToOneField(verbose_name=b'autorespond email', to='autorespond.GoogleCredential', on_delete=models.CASCADE),
         ),
         migrations.AlterField(
             model_name='autoresponse',

gchatautorespond/apps/autorespond/migrations/0008_auto_20151017_2054.py

@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='autoresponse',
             name='credentials',
-            field=models.OneToOneField(verbose_name=b'autorespond account', to='autorespond.GoogleCredential'),
+            field=models.OneToOneField(verbose_name=b'autorespond account', to='autorespond.GoogleCredential', on_delete=models.CASCADE),
         ),
     ]

gchatautorespond/apps/autorespond/migrations/0012_excludeduser.py

@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('name', models.CharField(max_length=128)),
-                ('autorespond', models.ForeignKey(verbose_name=b'autorespond', to='autorespond.AutoResponse')),
+                ('autorespond', models.ForeignKey(verbose_name=b'autorespond', to='autorespond.AutoResponse', on_delete=models.CASCADE)),
             ],
         ),
     ]

gchatautorespond/apps/autorespond/migrations/0015_auto_20171014_2254.py

@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('bare_jid', models.CharField(max_length=256)),
                 ('last_response_time', models.DateTimeField()),
-                ('autorespond', models.ForeignKey(verbose_name=b'autorespond', to='autorespond.AutoResponse')),
+                ('autorespond', models.ForeignKey(verbose_name=b'autorespond', to='autorespond.AutoResponse', on_delete=models.CASCADE)),
             ],
         ),
         migrations.AlterUniqueTogether(

gchatautorespond/apps/autorespond/models.py

@@ -30,7 +30,7 @@ def to_python(self, value):
 
 class GoogleCredential(models.Model):
     credentials = CompatCredentialsField()
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
     email = models.EmailField(unique=True)
 
     def __str__(self):
@@ -41,7 +41,7 @@ def __str__(self):
 
 class AutoResponse(models.Model):
     response = models.TextField()
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
     throttle_mins = models.PositiveSmallIntegerField(
         default=5,
         validators=[MinValueValidator(1)],
@@ -51,7 +51,9 @@ class AutoResponse(models.Model):
 
     credentials = models.OneToOneField(
         GoogleCredential,
-        verbose_name="autorespond account")
+        verbose_name="autorespond account",
+        on_delete=models.CASCADE,
+    )
 
     email_notifications = models.BooleanField(
         default=False,
@@ -85,7 +87,9 @@ class ExcludedUser(models.Model):
 
     autorespond = models.ForeignKey(
         AutoResponse,
-        verbose_name="autorespond")
+        verbose_name="autorespond",
+        on_delete=models.CASCADE,
+    )
 
     DEFAULT = 'DE'
     ALWAYS = 'AL'
@@ -111,7 +115,9 @@ def __str__(self):
 class LastResponse(models.Model):
     autorespond = models.ForeignKey(
         AutoResponse,
-        verbose_name="autorespond")
+        verbose_name="autorespond",
+        on_delete=models.CASCADE,
+    )
 
     bare_jid = models.CharField(
         max_length=256,

gchatautorespond/apps/autorespond/views.py

@@ -13,7 +13,7 @@
 import httplib2
 import oauth2client.contrib.xsrfutil as xsrfutil
 from oauth2client.client import flow_from_clientsecrets
-from django.contrib.auth.views import login as contrib_login
+from django.contrib.auth import views as auth_views
 from django.forms.models import modelformset_factory
 from django.conf import settings
 from django.views.generic import TemplateView
@@ -118,10 +118,10 @@ class TermsView(TemplateView):
 def login(request):
     """Default login, but redirect if we're already logged in."""
 
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         return redirect(settings.LOGIN_REDIRECT_URL)
 
-    return contrib_login(request)
+    return auth_views.LoginView.as_view()(request)
 
 
 @login_required
@@ -149,7 +149,7 @@ def test_view(request):
 def autorespond_view(request):
     """List/update accounts and autoresponses."""
 
-    if not request.user.is_authenticated():
+    if not request.user.is_authenticated:
         return redirect('logged_out')
 
     gcredentials = GoogleCredential.objects.filter(user=request.user)

gchatautorespond/apps/licensing/migrations/0001_initial.py

@@ -29,17 +29,17 @@ class Migration(migrations.Migration):
                 ('bt_status', models.TextField(blank=True)),
                 ('bt_subscription_id', models.TextField(blank=True)),
                 ('bt_customer_id', models.TextField(blank=True)),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
         ),
         migrations.AddField(
             model_name='currentlicense',
             name='license',
-            field=models.OneToOneField(to='licensing.License'),
+            field=models.OneToOneField(to='licensing.License', on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='currentlicense',
             name='user',
-            field=models.OneToOneField(to=settings.AUTH_USER_MODEL),
+            field=models.OneToOneField(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
         ),
     ]

gchatautorespond/apps/licensing/models.py

@@ -21,7 +21,7 @@ class Override(enum.Enum):
         ENABLE = 'EN'
         DISABLE = 'DI'
 
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
     trial_start = models.DateTimeField()
 
     created_at = models.DateTimeField(auto_now_add=True)
@@ -57,8 +57,8 @@ def __str__(self):
 
 
 class CurrentLicense(models.Model):
-    user = models.OneToOneField(User)
-    license = models.OneToOneField(License)
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
+    license = models.OneToOneField(License, on_delete=models.CASCADE)
 
     def __str__(self):
         return "<CurrentLicense %s user:%s license:%s>" % (self.id, self.user_id, self.license_id)

gchatautorespond/urls.py

@@ -17,7 +17,7 @@
     # TODO do this for signup as well?
     url(r'^accounts/login', views.login),
 
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 
     # Override the default registration form.
     url(r'^accounts/register/$', RegistrationView.as_view(form_class=RegTOS), name='registration_register'),

requirements.in

@@ -1,5 +1,5 @@
 braintree
-django<2
+django<2.3
 django-amazon-ses
 django-bootstrap3
 django-registration-redux
@@ -14,7 +14,7 @@ google-api-python-client
 google-measurement-protocol==1.0.0
 gunicorn[gevent]
 jsonpickle  # https://github.com/googleapis/oauth2client/issues/681
-oauth2client
+git+https://github.com/simon-weber/oauth2client.git@4.1.4-rc.1#egg=oauth2client==4.1.4-rc.1
 sentry-sdk[flask]
 requests
 git+https://github.com/simon-weber/SleekXMPP.git@1.5.0rc1#egg=sleekxmpp==1.5.0rc1

requirements.txt

@@ -14,7 +14,7 @@ chardet==3.0.4            # via requests
 click==6.6                # via flask
 django-amazon-ses==2.1.1
 django-bootstrap3==9.0.0
-django-registration-redux==1.9
+django-registration-redux==2.7
 django==1.11.28
 djmail==0.13.0
 dnspython==1.14.0
@@ -29,24 +29,24 @@ google-api-python-client==1.6.7
 google-measurement-protocol==1.0.0
 greenlet==0.4.15          # via gevent
 gunicorn[gevent]==19.9.0
-httplib2==0.9.2           # via google-api-python-client, oauth2client
+httplib2==0.9.2           # via google-api-python-client
 idna==2.7                 # via requests
 itsdangerous==0.24        # via flask
 jinja2==2.10.1            # via flask
 jmespath==0.9.4           # via boto3, botocore
 jsonpickle==1.2
 markupsafe==0.23          # via jinja2
-oauth2client==4.1.0
+git+https://github.com/simon-weber/oauth2client.git@4.1.4-rc.1#egg=oauth2client==4.1.4-rc.1
 prices==1.0.0             # via google-measurement-protocol
-pyasn1-modules==0.0.8     # via oauth2client
-pyasn1==0.1.9             # via oauth2client, pyasn1-modules, rsa
+pyasn1-modules==0.0.8
+pyasn1==0.1.9             # via pyasn1-modules, rsa
 python-dateutil==2.8.0    # via botocore
 pytz==2018.9              # via babel, django
 requests==2.20.1
-rsa==3.4.2                # via oauth2client
+rsa==3.4.2
 s3transfer==0.2.1         # via boto3
 sentry-sdk[flask]==0.10.2
-six==1.10.0               # via google-api-python-client, oauth2client, python-dateutil
+six==1.10.0               # via google-api-python-client, python-dateutil
 git+https://github.com/simon-weber/SleekXMPP.git@1.5.0rc1#egg=sleekxmpp==1.5.0rc1
 typing==3.7.4.1           # via google-measurement-protocol, prices
 uritemplate==3.0.0        # via google-api-python-client