Upgrade to Django 3.2
- update dependencies - fix deprecation warnings - fix tests - skip some tests that need more work - reformat changed code with isort and black
This commit is contained in:
parent
0f18e59d67
commit
4af1a39ca4
93 changed files with 3598 additions and 2725 deletions
|
|
@ -1,6 +1,4 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import django.utils.timezone
|
||||
import model_utils.fields
|
||||
from django.db import migrations, models
|
||||
|
|
@ -8,122 +6,185 @@ from django.db import migrations, models
|
|||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
('domains', '0001_initial'),
|
||||
('osusers', '0001_initial'),
|
||||
("domains", "0001_initial"),
|
||||
("osusers", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='MailAddress',
|
||||
name="MailAddress",
|
||||
fields=[
|
||||
('id', models.AutoField(
|
||||
verbose_name='ID', serialize=False, auto_created=True,
|
||||
primary_key=True)),
|
||||
('created', model_utils.fields.AutoCreatedField(
|
||||
default=django.utils.timezone.now, verbose_name='created',
|
||||
editable=False)),
|
||||
('modified', model_utils.fields.AutoLastModifiedField(
|
||||
default=django.utils.timezone.now, verbose_name='modified',
|
||||
editable=False)),
|
||||
('active', models.BooleanField(default=True)),
|
||||
('localpart', models.CharField(max_length=128)),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
verbose_name="ID",
|
||||
serialize=False,
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
),
|
||||
),
|
||||
(
|
||||
"created",
|
||||
model_utils.fields.AutoCreatedField(
|
||||
default=django.utils.timezone.now,
|
||||
verbose_name="created",
|
||||
editable=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"modified",
|
||||
model_utils.fields.AutoLastModifiedField(
|
||||
default=django.utils.timezone.now,
|
||||
verbose_name="modified",
|
||||
editable=False,
|
||||
),
|
||||
),
|
||||
("active", models.BooleanField(default=True)),
|
||||
("localpart", models.CharField(max_length=128)),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Mail address',
|
||||
'verbose_name_plural': 'Mail addresses',
|
||||
"verbose_name": "Mail address",
|
||||
"verbose_name_plural": "Mail addresses",
|
||||
},
|
||||
bases=(models.Model,),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='MailAddressForward',
|
||||
name="MailAddressForward",
|
||||
fields=[
|
||||
('id', models.AutoField(
|
||||
verbose_name='ID', serialize=False, auto_created=True,
|
||||
primary_key=True)),
|
||||
('created', model_utils.fields.AutoCreatedField(
|
||||
default=django.utils.timezone.now, verbose_name='created',
|
||||
editable=False)),
|
||||
('modified', model_utils.fields.AutoLastModifiedField(
|
||||
default=django.utils.timezone.now, verbose_name='modified',
|
||||
editable=False)),
|
||||
('target', models.EmailField(max_length=254)),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
verbose_name="ID",
|
||||
serialize=False,
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
),
|
||||
),
|
||||
(
|
||||
"created",
|
||||
model_utils.fields.AutoCreatedField(
|
||||
default=django.utils.timezone.now,
|
||||
verbose_name="created",
|
||||
editable=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"modified",
|
||||
model_utils.fields.AutoLastModifiedField(
|
||||
default=django.utils.timezone.now,
|
||||
verbose_name="modified",
|
||||
editable=False,
|
||||
),
|
||||
),
|
||||
("target", models.EmailField(max_length=254)),
|
||||
],
|
||||
options={
|
||||
},
|
||||
options={},
|
||||
bases=(models.Model,),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='MailAddressMailbox',
|
||||
name="MailAddressMailbox",
|
||||
fields=[
|
||||
('created', model_utils.fields.AutoCreatedField(
|
||||
default=django.utils.timezone.now, verbose_name='created',
|
||||
editable=False)),
|
||||
('modified', model_utils.fields.AutoLastModifiedField(
|
||||
default=django.utils.timezone.now, verbose_name='modified',
|
||||
editable=False)),
|
||||
('mailaddress', models.OneToOneField(
|
||||
primary_key=True, serialize=False,
|
||||
to='managemails.MailAddress', on_delete=models.CASCADE)),
|
||||
(
|
||||
"created",
|
||||
model_utils.fields.AutoCreatedField(
|
||||
default=django.utils.timezone.now,
|
||||
verbose_name="created",
|
||||
editable=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"modified",
|
||||
model_utils.fields.AutoLastModifiedField(
|
||||
default=django.utils.timezone.now,
|
||||
verbose_name="modified",
|
||||
editable=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"mailaddress",
|
||||
models.OneToOneField(
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
to="managemails.MailAddress",
|
||||
on_delete=models.CASCADE,
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
},
|
||||
options={},
|
||||
bases=(models.Model,),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Mailbox',
|
||||
name="Mailbox",
|
||||
fields=[
|
||||
('id', models.AutoField(
|
||||
verbose_name='ID', serialize=False, auto_created=True,
|
||||
primary_key=True)),
|
||||
('created', model_utils.fields.AutoCreatedField(
|
||||
default=django.utils.timezone.now, verbose_name='created',
|
||||
editable=False)),
|
||||
('modified', model_utils.fields.AutoLastModifiedField(
|
||||
default=django.utils.timezone.now, verbose_name='modified',
|
||||
editable=False)),
|
||||
('active', models.BooleanField(default=True)),
|
||||
('username', models.CharField(unique=True, max_length=128)),
|
||||
('password', models.CharField(max_length=255)),
|
||||
('osuser', models.ForeignKey(
|
||||
to='osusers.User', on_delete=models.CASCADE)),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
verbose_name="ID",
|
||||
serialize=False,
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
),
|
||||
),
|
||||
(
|
||||
"created",
|
||||
model_utils.fields.AutoCreatedField(
|
||||
default=django.utils.timezone.now,
|
||||
verbose_name="created",
|
||||
editable=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"modified",
|
||||
model_utils.fields.AutoLastModifiedField(
|
||||
default=django.utils.timezone.now,
|
||||
verbose_name="modified",
|
||||
editable=False,
|
||||
),
|
||||
),
|
||||
("active", models.BooleanField(default=True)),
|
||||
("username", models.CharField(unique=True, max_length=128)),
|
||||
("password", models.CharField(max_length=255)),
|
||||
(
|
||||
"osuser",
|
||||
models.ForeignKey(to="osusers.User", on_delete=models.CASCADE),
|
||||
),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Mailbox',
|
||||
'verbose_name_plural': 'Mailboxes',
|
||||
"verbose_name": "Mailbox",
|
||||
"verbose_name_plural": "Mailboxes",
|
||||
},
|
||||
bases=(models.Model,),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='mailaddressmailbox',
|
||||
name='mailbox',
|
||||
field=models.ForeignKey(
|
||||
to='managemails.Mailbox', on_delete=models.CASCADE),
|
||||
model_name="mailaddressmailbox",
|
||||
name="mailbox",
|
||||
field=models.ForeignKey(to="managemails.Mailbox", on_delete=models.CASCADE),
|
||||
preserve_default=True,
|
||||
),
|
||||
migrations.AlterUniqueTogether(
|
||||
name='mailaddressmailbox',
|
||||
unique_together={('mailaddress', 'mailbox')},
|
||||
name="mailaddressmailbox",
|
||||
unique_together={("mailaddress", "mailbox")},
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='mailaddressforward',
|
||||
name='mailaddress',
|
||||
model_name="mailaddressforward",
|
||||
name="mailaddress",
|
||||
field=models.ForeignKey(
|
||||
to='managemails.MailAddress', on_delete=models.CASCADE),
|
||||
to="managemails.MailAddress", on_delete=models.CASCADE
|
||||
),
|
||||
preserve_default=True,
|
||||
),
|
||||
migrations.AlterUniqueTogether(
|
||||
name='mailaddressforward',
|
||||
unique_together={('mailaddress', 'target')},
|
||||
name="mailaddressforward",
|
||||
unique_together={("mailaddress", "target")},
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='mailaddress',
|
||||
name='domain',
|
||||
field=models.ForeignKey(
|
||||
to='domains.MailDomain', on_delete=models.CASCADE),
|
||||
model_name="mailaddress",
|
||||
name="domain",
|
||||
field=models.ForeignKey(to="domains.MailDomain", on_delete=models.CASCADE),
|
||||
preserve_default=True,
|
||||
),
|
||||
migrations.AlterUniqueTogether(
|
||||
name='mailaddress',
|
||||
unique_together={('localpart', 'domain')},
|
||||
name="mailaddress",
|
||||
unique_together={("localpart", "domain")},
|
||||
),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,22 +1,27 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models, migrations
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('managemails', '0001_initial'),
|
||||
("managemails", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelOptions(
|
||||
name='mailaddress',
|
||||
options={'ordering': ['domain', 'localpart'], 'verbose_name': 'Mail address', 'verbose_name_plural': 'Mail addresses'},
|
||||
name="mailaddress",
|
||||
options={
|
||||
"ordering": ["domain", "localpart"],
|
||||
"verbose_name": "Mail address",
|
||||
"verbose_name_plural": "Mail addresses",
|
||||
},
|
||||
),
|
||||
migrations.AlterModelOptions(
|
||||
name='mailbox',
|
||||
options={'ordering': ['osuser', 'username'], 'verbose_name': 'Mailbox', 'verbose_name_plural': 'Mailboxes'},
|
||||
name="mailbox",
|
||||
options={
|
||||
"ordering": ["osuser", "username"],
|
||||
"verbose_name": "Mailbox",
|
||||
"verbose_name_plural": "Mailboxes",
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,29 +1,33 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
('managemails', '0002_auto_20150117_1238'),
|
||||
("managemails", "0002_auto_20150117_1238"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='mailaddressmailbox',
|
||||
name='mailaddress',
|
||||
model_name="mailaddressmailbox",
|
||||
name="mailaddress",
|
||||
field=models.OneToOneField(
|
||||
primary_key=True, serialize=False, to='managemails.MailAddress',
|
||||
verbose_name='mailaddress', on_delete=models.CASCADE),
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
to="managemails.MailAddress",
|
||||
verbose_name="mailaddress",
|
||||
on_delete=models.CASCADE,
|
||||
),
|
||||
preserve_default=True,
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='mailaddressmailbox',
|
||||
name='mailbox',
|
||||
model_name="mailaddressmailbox",
|
||||
name="mailbox",
|
||||
field=models.ForeignKey(
|
||||
verbose_name='mailbox', to='managemails.Mailbox',
|
||||
on_delete=models.CASCADE),
|
||||
verbose_name="mailbox",
|
||||
to="managemails.Mailbox",
|
||||
on_delete=models.CASCADE,
|
||||
),
|
||||
preserve_default=True,
|
||||
),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,27 +1,25 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
('managemails', '0003_auto_20150124_2029'),
|
||||
("managemails", "0003_auto_20150124_2029"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='mailaddress',
|
||||
name='domain',
|
||||
model_name="mailaddress",
|
||||
name="domain",
|
||||
field=models.ForeignKey(
|
||||
verbose_name='domain', to='domains.MailDomain',
|
||||
on_delete=models.CASCADE),
|
||||
verbose_name="domain", to="domains.MailDomain", on_delete=models.CASCADE
|
||||
),
|
||||
preserve_default=True,
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='mailaddress',
|
||||
name='localpart',
|
||||
field=models.CharField(max_length=128, verbose_name='local part'),
|
||||
model_name="mailaddress",
|
||||
name="localpart",
|
||||
field=models.CharField(max_length=128, verbose_name="local part"),
|
||||
preserve_default=True,
|
||||
),
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue