Merge branch 'devel' into 'master'

Merge with master

See merge request oliver/ivatar!89

ivatar/ivataraccount/migrations/0008_userpreference.py

@@ -1,3 +1,4 @@
+# pylint: disable=invalid-name,missing-docstring
 # Generated by Django 2.0.6 on 2018-07-04 12:32
 
 from django.conf import settings
@@ -5,18 +6,18 @@ from django.db import migrations, models
 import django.db.models.deletion
 
 
-def add_preference_to_user(apps, schema_editor):
+def add_preference_to_user(apps, schema_editor):  # pylint: disable=unused-argument
     '''
     Make sure all users have preferences set up
     '''
     from django.contrib.auth.models import User
-    UserPreference = apps.get_model('ivataraccount', 'UserPreference')
-    for u in User.objects.filter(userpreference=None):
-        p = UserPreference.objects.create(user_id=u.pk)
-        p.save()
+    UserPreference = apps.get_model('ivataraccount', 'UserPreference')  # pylint: disable=invalid-name
+    for user in User.objects.filter(userpreference=None):
+        pref = UserPreference.objects.create(user_id=user.pk)  # pragma: no cover
+        pref.save()  # pragma: no cover
 
 
-class Migration(migrations.Migration):
+class Migration(migrations.Migration):  # pylint: disable=missing-docstring
 
     dependencies = [
         ('auth', '0009_alter_user_last_name_max_length'),
@@ -27,8 +28,16 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='UserPreference',
             fields=[
-                ('theme', models.CharField(choices=[('default', 'Default theme'), ('clime', 'Climes theme')], default='default', max_length=10)),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)),
+                ('theme', models.CharField(
+                    choices=[
+                        ('default', 'Default theme'),
+                        ('clime', 'Climes theme')],
+                    default='default', max_length=10)),
+                ('user', models.OneToOneField(
+                    on_delete=django.db.models.deletion.CASCADE,
+                    primary_key=True,
+                    serialize=False,
+                    to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.RunPython(add_preference_to_user),