Merge lp:~roadmr/canonical-identity-provider/fix-deprecation-warnings-1 into lp:canonical-identity-provider/release

[Daniel Manrique]

Fix deprecation warnings concerning on_delete on model field definitions and migrations.

This fixes only such warnings in this project's code; some remain on django-piston and django-openid-auth, which will be tackled separately.

Fix deprecation warnings concerning on_delete on model field definitions and migrations.

This fixes only such warnings in this project's code; some remain on django-piston and django-openid-auth, which will be tackled separately.

[Maximiliano Bertacchini (maxiberta)]

+1, thanks!

review: Approve

=== modified file 'Makefile'
--- Makefile	2018-04-16 21:22:24 +0000
+++ Makefile	2018-05-25 18:10:37 +0000
@@ -11,7 +11,7 @@
 LOCAL_SETTINGS_DIR ?= $(CURDIR)/../local_config
 LOCAL_SETTINGS_PATH = $(LOCAL_SETTINGS_DIR)/settings.py
 FLAKE8 = $(ENV)/bin/flake8
-PYTHON = $(ENV)/bin/python -Wd
+PYTHON = $(ENV)/bin/python -Wd -Wignore:"Not importing":ImportWarning
 PIP = $(PYTHON) $(ENV)/bin/pip
 SRC_DIR = $(CURDIR)/src
 LIB_DIR = $(CURDIR)/lib

=== modified file 'src/identityprovider/migrations/0001_initial.py'
--- src/identityprovider/migrations/0001_initial.py	2015-06-26 16:21:26 +0000
+++ src/identityprovider/migrations/0001_initial.py	2018-05-25 18:10:37 +0000
@@ -69,7 +69,7 @@
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('password', identityprovider.models.account.PasswordField()),
-                ('account', models.OneToOneField(db_column=b'account', to='identityprovider.Account')),
+                ('account', models.OneToOneField(db_column=b'account', on_delete=models.CASCADE, to='identityprovider.Account')),
             ],
             options={
                 'db_table': 'accountpassword',
@@ -102,7 +102,7 @@
                 ('name', models.TextField()),
                 ('counter', models.IntegerField(default=0)),
                 ('device_type', models.TextField(null=True)),
-                ('account', models.ForeignKey(related_name='devices', to='identityprovider.Account')),
+                ('account', models.ForeignKey(related_name='devices', on_delete=models.CASCADE, to='identityprovider.Account')),
             ],
             options={
                 'ordering': ('id',),
@@ -122,7 +122,7 @@
                 ('redirection_url', models.TextField(null=True, blank=True)),
                 ('displayname', identityprovider.models.account.DisplaynameField(null=True, blank=True)),
                 ('password', identityprovider.models.account.PasswordField(null=True, blank=True)),
-                ('requester', models.ForeignKey(db_column=b'requester', blank=True, to='identityprovider.Account', null=True)),
+                ('requester', models.ForeignKey(db_column=b'requester', blank=True, on_delete=models.CASCADE, to='identityprovider.Account', null=True)),
             ],
             options={
                 'db_table': 'authtoken',
@@ -137,7 +137,7 @@
                 ('lp_person', models.IntegerField(null=True, editable=False, db_column=b'person', blank=True)),
                 ('status', models.IntegerField(choices=[(1, b'NEW'), (2, b'VALIDATED'), (4, b'PREFERRED')])),
                 ('date_created', models.DateTimeField(default=django.utils.timezone.now, editable=False, blank=True)),
-                ('account', models.ForeignKey(db_column=b'account', blank=True, to='identityprovider.Account', null=True)),
+                ('account', models.ForeignKey(db_column=b'account', blank=True, on_delete=models.CASCADE, to='identityprovider.Account', null=True)),
             ],
             options={
                 'db_table': 'emailaddress',
@@ -153,7 +153,7 @@
                 ('date_created', models.DateTimeField(editable=False, blank=True)),
                 ('date_invalidated', models.DateTimeField(default=django.utils.timezone.now, null=True, blank=True)),
                 ('account_notified', models.BooleanField(default=False)),
-                ('account', models.ForeignKey(db_column=b'account', blank=True, to='identityprovider.Account', null=True)),
+                ('account', models.ForeignKey(db_column=b'account', blank=True, on_delete=models.CASCADE, to='identityprovider.Account', null=True)),
             ],
             options={
                 'db_table': 'invalidated_emailaddress',
@@ -212,7 +212,7 @@
                 ('date_created', models.DateTimeField(default=django.utils.timezone.now, editable=False, blank=True)),
                 ('date_expires', models.DateTimeField()),
                 ('trust_root', models.TextField()),
-                ('account', models.ForeignKey(to='identityprovider.Account', db_column=b'account')),
+                ('account', models.ForeignKey(on_delete=models.CASCADE, to='identityprovider.Account', db_column=b'account')),
             ],
             options={
                 'db_table': 'openidauthorization',
@@ -268,7 +268,7 @@
                 ('date_last_used', models.DateTimeField(default=django.utils.timezone.now, editable=False, blank=True)),
                 ('total_logins', models.IntegerField(default=1)),
                 ('approved_data', models.TextField(default='', null=True, blank=True)),
-                ('account', models.ForeignKey(to='identityprovider.Account', db_column=b'account')),
+                ('account', models.ForeignKey(on_delete=models.CASCADE, to='identityprovider.Account', db_column=b'account')),
             ],
             options={
                 'db_table': 'openidrpsummary',
@@ -333,7 +333,7 @@
                 ('date_last_modified', models.DateTimeField(null=True)),
                 ('visible', models.NullBooleanField(default=True)),
                 ('locked', models.NullBooleanField(default=False)),
-                ('person', models.OneToOneField(null=True, db_column=b'person', to='identityprovider.Person')),
+                ('person', models.OneToOneField(null=True, db_column=b'person', on_delete=models.CASCADE, to='identityprovider.Person')),
             ],
             options={
                 'db_table': 'lp_personlocation',
@@ -344,8 +344,8 @@
             name='TeamParticipation',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('person', models.ForeignKey(db_column=b'person', to='identityprovider.Person', null=True)),
-                ('team', models.ForeignKey(related_name='team_participations', db_column=b'team', to='identityprovider.Person', null=True)),
+                ('person', models.ForeignKey(db_column=b'person', on_delete=models.CASCADE, to='identityprovider.Person', null=True)),
+                ('team', models.ForeignKey(related_name='team_participations', db_column=b'team', on_delete=models.CASCADE, to='identityprovider.Person', null=True)),
             ],
             options={
                 'db_table': 'lp_teamparticipation',
@@ -361,7 +361,7 @@
                 ('secret', models.TextField(default=identityprovider.utils.generate_random_string_len_70)),
                 ('date_created', models.DateTimeField(default=django.utils.timezone.now)),
                 ('date_updated', models.DateTimeField(default=django.utils.timezone.now)),
-                ('consumer', models.ForeignKey(to='identityprovider.Account')),
+                ('consumer', models.ForeignKey(on_delete=models.CASCADE, to='identityprovider.Account')),
             ],
             options={
             },

=== modified file 'src/identityprovider/migrations/0005_authlog.py'
--- src/identityprovider/migrations/0005_authlog.py	2015-12-10 20:27:28 +0000
+++ src/identityprovider/migrations/0005_authlog.py	2018-05-25 18:10:37 +0000
@@ -38,7 +38,7 @@
                 ('referer', models.TextField()),
                 ('remote_ip', models.GenericIPAddressField()),
                 ('user_agent', models.TextField()),
-                ('account', models.ForeignKey(to='identityprovider.Account', null=True)),
+                ('account', models.ForeignKey(on_delete=models.CASCADE, to='identityprovider.Account', null=True)),
             ],
             options={
             },

=== modified file 'src/identityprovider/models/account.py'
--- src/identityprovider/models/account.py	2018-02-15 11:27:21 +0000
+++ src/identityprovider/models/account.py	2018-05-25 18:10:37 +0000
@@ -700,7 +700,8 @@
 
 
 class AccountPassword(models.Model):
-    account = models.OneToOneField(Account, db_column=b'account')
+    account = models.OneToOneField(
+        Account, db_column=b'account', on_delete=models.CASCADE)
     password = PasswordField()
     last_leak_check = models.DateTimeField(null=True)
     date_changed = models.DateTimeField(null=True, editable=False)
@@ -737,7 +738,7 @@
 
 class Token(models.Model):
 
-    consumer = models.ForeignKey(Account)
+    consumer = models.ForeignKey(Account, on_delete=models.CASCADE)
     name = models.TextField()
     scope = models.TextField(
         choices=TokenScope._get_choices(), default=TokenScope.VERSION_2)

=== modified file 'src/identityprovider/models/authlog.py'
--- src/identityprovider/models/authlog.py	2015-09-15 22:30:26 +0000
+++ src/identityprovider/models/authlog.py	2018-05-25 18:10:37 +0000
@@ -23,7 +23,7 @@
     # EmailField, so we can 1) accept input longer than 255 chars, and 2)
     # accept input that's not valid e-mail addresses (we want to log that).
     login_email = models.TextField(default='', null=False)
-    account = models.ForeignKey(Account, null=True)
+    account = models.ForeignKey(Account, null=True, on_delete=models.CASCADE)
     referer = models.TextField()
     remote_ip = models.GenericIPAddressField()
     user_agent = models.TextField()

=== modified file 'src/identityprovider/models/authtoken.py'
--- src/identityprovider/models/authtoken.py	2017-06-08 20:45:08 +0000
+++ src/identityprovider/models/authtoken.py	2018-05-25 18:10:37 +0000
@@ -102,7 +102,8 @@
     token_type = models.IntegerField(choices=AuthTokenType._get_choices())
     hashed_token = models.TextField(unique=True, db_column=b'token')
     requester = models.ForeignKey(
-        Account, db_column=b'requester', null=True, blank=True)
+        Account, db_column=b'requester', null=True,
+        on_delete=models.CASCADE, blank=True)
     requester_email = models.TextField(null=True, blank=True)
     email = models.TextField(db_index=True, validators=[validate_email])
     redirection_url = models.TextField(null=True, blank=True)

=== modified file 'src/identityprovider/models/emailaddress.py'
--- src/identityprovider/models/emailaddress.py	2018-05-09 22:00:09 +0000
+++ src/identityprovider/models/emailaddress.py	2018-05-25 18:10:37 +0000
@@ -41,7 +41,8 @@
     date_created = models.DateTimeField(
         default=now, blank=True, editable=False)
     account = models.ForeignKey(
-        Account, db_column=b'account', blank=True, null=True)
+        Account, db_column=b'account', blank=True,
+        null=True, on_delete=models.CASCADE)
 
     objects = EmailAddressManager.from_queryset(EmailAddressQuerySet)()
 
@@ -96,7 +97,8 @@
         default=now, blank=True, editable=False)
     date_invalidated = models.DateTimeField(default=now, null=True, blank=True)
     account = models.ForeignKey(
-        Account, db_column=b'account', blank=True, null=True)
+        Account, db_column=b'account', blank=True,
+        null=True, on_delete=models.CASCADE)
     account_notified = models.BooleanField(default=False)
 
     class Meta:

=== modified file 'src/identityprovider/models/openidmodels.py'
--- src/identityprovider/models/openidmodels.py	2018-02-09 20:56:16 +0000
+++ src/identityprovider/models/openidmodels.py	2018-05-25 18:10:37 +0000
@@ -87,7 +87,8 @@
 
 
 class OpenIDAuthorization(models.Model):
-    account = models.ForeignKey(Account, db_column=b'account')
+    account = models.ForeignKey(
+        Account, db_column=b'account', on_delete=models.CASCADE)
     client_id = models.TextField(blank=True, null=True)
     date_created = models.DateTimeField(
         default=now, blank=True, editable=False)
@@ -228,7 +229,8 @@
 
 
 class OpenIDRPSummary(models.Model):
-    account = models.ForeignKey(Account, db_column=b'account')
+    account = models.ForeignKey(
+        Account, db_column=b'account', on_delete=models.CASCADE)
     openid_identifier = models.TextField(db_index=True)
     trust_root = models.TextField(db_index=True)
     date_created = models.DateTimeField(

=== modified file 'src/identityprovider/models/person.py'
--- src/identityprovider/models/person.py	2018-02-09 15:07:55 +0000
+++ src/identityprovider/models/person.py	2018-05-25 18:10:37 +0000
@@ -161,7 +161,8 @@
 
 class PersonLocation(models.Model):
     date_created = models.DateTimeField(null=True)
-    person = models.OneToOneField(Person, db_column=b'person', null=True)
+    person = models.OneToOneField(
+        Person, db_column=b'person', null=True, on_delete=models.CASCADE)
     latitude = models.FloatField(null=True, blank=True)
     longitude = models.FloatField(null=True, blank=True)
     time_zone = models.TextField(null=True, blank=True)
@@ -177,9 +178,11 @@
 
 
 class TeamParticipation(models.Model):
-    team = models.ForeignKey(Person, db_column=b'team', null=True,
-                             related_name='team_participations')
-    person = models.ForeignKey(Person, db_column=b'person', null=True)
+    team = models.ForeignKey(
+        Person, db_column=b'team', null=True,
+        on_delete=models.CASCADE, related_name='team_participations')
+    person = models.ForeignKey(
+        Person, db_column=b'person', null=True, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'identityprovider'

=== modified file 'src/identityprovider/models/twofactor.py'
--- src/identityprovider/models/twofactor.py	2018-02-09 20:56:16 +0000
+++ src/identityprovider/models/twofactor.py	2018-05-25 18:10:37 +0000
@@ -128,7 +128,8 @@
 
 
 class AuthenticationDevice(models.Model):
-    account = models.ForeignKey(Account, related_name='devices')
+    account = models.ForeignKey(
+        Account, on_delete=models.CASCADE, related_name='devices')
     key = models.TextField()
     name = models.TextField()
     counter = models.IntegerField(default=0)

=== modified file 'src/oauth_backend/migrations/0001_initial.py'
--- src/oauth_backend/migrations/0001_initial.py	2015-09-22 14:47:30 +0000
+++ src/oauth_backend/migrations/0001_initial.py	2018-05-25 18:10:37 +0000
@@ -21,7 +21,7 @@
                 ('secret', models.CharField(default=oauth_backend.models.generate_random_string_secret, max_length=255, blank=True)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('user', models.OneToOneField(related_name='oauth_consumer', to=settings.AUTH_USER_MODEL)),
+                ('user', models.OneToOneField(related_name='oauth_consumer', on_delete=models.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'db_table': 'oauth_consumer',
@@ -34,7 +34,7 @@
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('nonce', models.CharField(max_length=255, editable=False)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('consumer', models.ForeignKey(to='oauth_backend.Consumer')),
+                ('consumer', models.ForeignKey(on_delete=models.CASCADE, to='oauth_backend.Consumer')),
             ],
             options={
                 'db_table': 'oauth_nonce',
@@ -49,7 +49,7 @@
                 ('name', models.CharField(max_length=255, blank=True)),
                 ('created_at', models.DateTimeField(default=django.utils.timezone.now)),
                 ('updated_at', models.DateTimeField(default=django.utils.timezone.now)),
-                ('consumer', models.ForeignKey(to='oauth_backend.Consumer')),
+                ('consumer', models.ForeignKey(on_delete=models.CASCADE, to='oauth_backend.Consumer')),
             ],
             options={
                 'db_table': 'oauth_token',
@@ -59,7 +59,7 @@
         migrations.AddField(
             model_name='nonce',
             name='token',
-            field=models.ForeignKey(to='oauth_backend.Token'),
+            field=models.ForeignKey(on_delete=models.CASCADE, to='oauth_backend.Token'),
             preserve_default=True,
         ),
         migrations.AlterUniqueTogether(

=== modified file 'src/oauth_backend/models.py'
--- src/oauth_backend/models.py	2015-09-22 16:11:08 +0000
+++ src/oauth_backend/models.py	2018-05-25 18:10:37 +0000
@@ -44,7 +44,8 @@
 class Consumer(models.Model):
     """An OAuth consumer (client)."""
 
-    user = models.OneToOneField(User, related_name='oauth_consumer')
+    user = models.OneToOneField(
+        User, on_delete=models.CASCADE, related_name='oauth_consumer')
 
     secret = models.CharField(
         max_length=255, blank=True, default=generate_random_string_secret,
@@ -67,7 +68,7 @@
 class Token(models.Model):
     """An OAuth access token."""
 
-    consumer = models.ForeignKey(Consumer)
+    consumer = models.ForeignKey(Consumer, on_delete=models.CASCADE)
 
     token = models.CharField(
         max_length=TOKEN_LENGTH, default=generate_random_string_token,