Skip to content

Commit 63d428d

Browse files
pradyunsgpradyunsg
authored
Merge pull request #662 from pradyunsg/pr/653
Fix on_delete deprecation warnings + linting improvements
2 parents cb63800 + 4cc2bfd commit 63d428d

File tree

72 files changed

+2850
-852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+2850
-852
lines changed

‎.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ repos:
2323
rev: 3.7.9
2424
hooks:
2525
- id: flake8
26-
exclude: .*/migrations/.*|settings/.*
26+
# These are only excluded because they're a mess right now.
27+
exclude: settings/.*
2728

2829
- repo: https://github.com/timothycrosley/isort
2930
rev: 4.3.21
@@ -36,4 +37,3 @@ repos:
3637
hooks:
3738
- id: black
3839
language_version: python3.6
39-
exclude: .*/migrations/.*

‎junction/base/models.py

+2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@ class UserAuditModel(models.Model):
2626
null=True,
2727
blank=True,
2828
verbose_name="Created By",
29+
on_delete=models.SET_NULL,
2930
)
3031
modified_by = models.ForeignKey(
3132
User,
3233
related_name="updated_%(class)s_set",
3334
null=True,
3435
blank=True,
3536
verbose_name="Modified By",
37+
on_delete=models.SET_NULL,
3638
)
3739

3840
class Meta:

‎junction/conferences/migrations/0001_initial.py

+196-41
Original file line numberDiff line numberDiff line change
@@ -14,61 +14,216 @@ class Migration(migrations.Migration):
1414

1515
operations = [
1616
migrations.CreateModel(
17-
name='Conference',
17+
name="Conference",
1818
fields=[
19-
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
20-
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
21-
('modified_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
22-
('name', models.CharField(max_length=255, verbose_name='Conference Name')),
23-
('slug', django_extensions.db.fields.AutoSlugField(editable=False, populate_from=('name',), max_length=255, blank=True, unique=True)),
24-
('description', models.TextField(default='')),
25-
('start_date', models.DateField(verbose_name='Start Date')),
26-
('end_date', models.DateField(verbose_name='End Date')),
27-
('status', models.PositiveSmallIntegerField(verbose_name='Current Status', choices=[(1, b'Accepting Call for Proposals'), (2, b'Closed for Proposals'), (3, b'Accepting Votes'), (4, b'Schedule Published')])),
28-
('deleted', models.BooleanField(default=False, verbose_name='Is Deleted?')),
29-
('created_by', models.ForeignKey(related_name='created_conference_set', verbose_name='Created By', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
30-
('modified_by', models.ForeignKey(related_name='updated_conference_set', verbose_name='Modified By', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
19+
(
20+
"id",
21+
models.AutoField(
22+
verbose_name="ID",
23+
serialize=False,
24+
auto_created=True,
25+
primary_key=True,
26+
),
27+
),
28+
(
29+
"created_at",
30+
models.DateTimeField(auto_now_add=True, verbose_name="Created At"),
31+
),
32+
(
33+
"modified_at",
34+
models.DateTimeField(
35+
auto_now=True, verbose_name="Last Modified At"
36+
),
37+
),
38+
(
39+
"name",
40+
models.CharField(max_length=255, verbose_name="Conference Name"),
41+
),
42+
(
43+
"slug",
44+
django_extensions.db.fields.AutoSlugField(
45+
editable=False,
46+
populate_from=("name",),
47+
max_length=255,
48+
blank=True,
49+
unique=True,
50+
),
51+
),
52+
("description", models.TextField(default="")),
53+
("start_date", models.DateField(verbose_name="Start Date")),
54+
("end_date", models.DateField(verbose_name="End Date")),
55+
(
56+
"status",
57+
models.PositiveSmallIntegerField(
58+
verbose_name="Current Status",
59+
choices=[
60+
(1, b"Accepting Call for Proposals"),
61+
(2, b"Closed for Proposals"),
62+
(3, b"Accepting Votes"),
63+
(4, b"Schedule Published"),
64+
],
65+
),
66+
),
67+
(
68+
"deleted",
69+
models.BooleanField(default=False, verbose_name="Is Deleted?"),
70+
),
71+
(
72+
"created_by",
73+
models.ForeignKey(
74+
related_name="created_conference_set",
75+
verbose_name="Created By",
76+
blank=True,
77+
on_delete=models.deletion.CASCADE,
78+
to=settings.AUTH_USER_MODEL,
79+
null=True,
80+
),
81+
),
82+
(
83+
"modified_by",
84+
models.ForeignKey(
85+
related_name="updated_conference_set",
86+
verbose_name="Modified By",
87+
blank=True,
88+
on_delete=models.deletion.CASCADE,
89+
to=settings.AUTH_USER_MODEL,
90+
null=True,
91+
),
92+
),
3193
],
32-
options={
33-
'abstract': False,
34-
},
94+
options={"abstract": False},
3595
bases=(models.Model,),
3696
),
3797
migrations.CreateModel(
38-
name='ConferenceModerator',
98+
name="ConferenceModerator",
3999
fields=[
40-
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
41-
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
42-
('modified_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
43-
('active', models.BooleanField(default=True, verbose_name='Is Active?')),
44-
('conference', models.ForeignKey(to='conferences.Conference')),
45-
('created_by', models.ForeignKey(related_name='created_conferencemoderator_set', verbose_name='Created By', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
46-
('moderator', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
47-
('modified_by', models.ForeignKey(related_name='updated_conferencemoderator_set', verbose_name='Modified By', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
100+
(
101+
"id",
102+
models.AutoField(
103+
verbose_name="ID",
104+
serialize=False,
105+
auto_created=True,
106+
primary_key=True,
107+
),
108+
),
109+
(
110+
"created_at",
111+
models.DateTimeField(auto_now_add=True, verbose_name="Created At"),
112+
),
113+
(
114+
"modified_at",
115+
models.DateTimeField(
116+
auto_now=True, verbose_name="Last Modified At"
117+
),
118+
),
119+
(
120+
"active",
121+
models.BooleanField(default=True, verbose_name="Is Active?"),
122+
),
123+
(
124+
"conference",
125+
models.ForeignKey(
126+
to="conferences.Conference", on_delete=models.deletion.CASCADE,
127+
),
128+
),
129+
(
130+
"created_by",
131+
models.ForeignKey(
132+
related_name="created_conferencemoderator_set",
133+
verbose_name="Created By",
134+
blank=True,
135+
on_delete=models.deletion.CASCADE,
136+
to=settings.AUTH_USER_MODEL,
137+
null=True,
138+
),
139+
),
140+
(
141+
"moderator",
142+
models.ForeignKey(
143+
to=settings.AUTH_USER_MODEL, on_delete=models.deletion.CASCADE,
144+
),
145+
),
146+
(
147+
"modified_by",
148+
models.ForeignKey(
149+
related_name="updated_conferencemoderator_set",
150+
verbose_name="Modified By",
151+
blank=True,
152+
on_delete=models.deletion.CASCADE,
153+
to=settings.AUTH_USER_MODEL,
154+
null=True,
155+
),
156+
),
48157
],
49-
options={
50-
'abstract': False,
51-
},
158+
options={"abstract": False},
52159
bases=(models.Model,),
53160
),
54161
migrations.CreateModel(
55-
name='ConferenceProposalReviewer',
162+
name="ConferenceProposalReviewer",
56163
fields=[
57-
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
58-
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
59-
('modified_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
60-
('active', models.BooleanField(default=True, verbose_name='Is Active?')),
61-
('conference', models.ForeignKey(to='conferences.Conference')),
62-
('created_by', models.ForeignKey(related_name='created_conferenceproposalreviewer_set', verbose_name='Created By', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
63-
('modified_by', models.ForeignKey(related_name='updated_conferenceproposalreviewer_set', verbose_name='Modified By', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
64-
('reviewer', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
164+
(
165+
"id",
166+
models.AutoField(
167+
verbose_name="ID",
168+
serialize=False,
169+
auto_created=True,
170+
primary_key=True,
171+
),
172+
),
173+
(
174+
"created_at",
175+
models.DateTimeField(auto_now_add=True, verbose_name="Created At"),
176+
),
177+
(
178+
"modified_at",
179+
models.DateTimeField(
180+
auto_now=True, verbose_name="Last Modified At"
181+
),
182+
),
183+
(
184+
"active",
185+
models.BooleanField(default=True, verbose_name="Is Active?"),
186+
),
187+
(
188+
"conference",
189+
models.ForeignKey(
190+
to="conferences.Conference", on_delete=models.deletion.CASCADE,
191+
),
192+
),
193+
(
194+
"created_by",
195+
models.ForeignKey(
196+
related_name="created_conferenceproposalreviewer_set",
197+
verbose_name="Created By",
198+
blank=True,
199+
on_delete=models.deletion.CASCADE,
200+
to=settings.AUTH_USER_MODEL,
201+
null=True,
202+
),
203+
),
204+
(
205+
"modified_by",
206+
models.ForeignKey(
207+
related_name="updated_conferenceproposalreviewer_set",
208+
verbose_name="Modified By",
209+
blank=True,
210+
on_delete=models.deletion.CASCADE,
211+
to=settings.AUTH_USER_MODEL,
212+
null=True,
213+
),
214+
),
215+
(
216+
"reviewer",
217+
models.ForeignKey(
218+
to=settings.AUTH_USER_MODEL, on_delete=models.deletion.CASCADE,
219+
),
220+
),
65221
],
66-
options={
67-
},
222+
options={},
68223
bases=(models.Model,),
69224
),
70225
migrations.AlterUniqueTogether(
71-
name='conferenceproposalreviewer',
72-
unique_together=set([('conference', 'reviewer')]),
226+
name="conferenceproposalreviewer",
227+
unique_together=set([("conference", "reviewer")]),
73228
),
74229
]

‎junction/conferences/migrations/0002_auto_20150109_1527.py

+24-13
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,43 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
('conferences', '0001_initial'),
10+
("conferences", "0001_initial"),
1111
]
1212

1313
operations = [
1414
migrations.AlterModelOptions(
15-
name='conferencemoderator',
16-
options={'verbose_name': 'moderator', 'verbose_name_plural': 'moderators'},
15+
name="conferencemoderator",
16+
options={"verbose_name": "moderator", "verbose_name_plural": "moderators"},
1717
),
1818
migrations.AlterModelOptions(
19-
name='conferenceproposalreviewer',
20-
options={'verbose_name': 'proposals reviewer', 'verbose_name_plural': 'proposals reviewers'},
19+
name="conferenceproposalreviewer",
20+
options={
21+
"verbose_name": "proposals reviewer",
22+
"verbose_name_plural": "proposals reviewers",
23+
},
2124
),
2225
migrations.AlterField(
23-
model_name='conferencemoderator',
24-
name='conference',
25-
field=models.ForeignKey(related_name='moderators', to='conferences.Conference'),
26+
model_name="conferencemoderator",
27+
name="conference",
28+
field=models.ForeignKey(
29+
related_name="moderators",
30+
to="conferences.Conference",
31+
on_delete=models.deletion.CASCADE,
32+
),
2633
preserve_default=True,
2734
),
2835
migrations.AlterField(
29-
model_name='conferenceproposalreviewer',
30-
name='conference',
31-
field=models.ForeignKey(related_name='proposal_reviewers', to='conferences.Conference'),
36+
model_name="conferenceproposalreviewer",
37+
name="conference",
38+
field=models.ForeignKey(
39+
related_name="proposal_reviewers",
40+
to="conferences.Conference",
41+
on_delete=models.deletion.CASCADE,
42+
),
3243
preserve_default=True,
3344
),
3445
migrations.AlterUniqueTogether(
35-
name='conferencemoderator',
36-
unique_together=set([('conference', 'moderator')]),
46+
name="conferencemoderator",
47+
unique_together=set([("conference", "moderator")]),
3748
),
3849
]

‎junction/conferences/migrations/0003_auto_20150113_1120.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
33

4-
from django.db import migrations, models
4+
from django.db import migrations
55

66

77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
('conferences', '0002_auto_20150109_1527'),
10+
("conferences", "0002_auto_20150109_1527"),
1111
]
1212

1313
operations = [
1414
migrations.AlterModelOptions(
15-
name='conference',
16-
options={'get_latest_by': 'start_date', 'verbose_name': 'Conference', 'ordering': ('-start_date', 'name'), 'verbose_name_plural': 'Conferences'},
15+
name="conference",
16+
options={
17+
"get_latest_by": "start_date",
18+
"verbose_name": "Conference",
19+
"ordering": ("-start_date", "name"),
20+
"verbose_name_plural": "Conferences",
21+
},
1722
),
1823
]

‎junction/conferences/migrations/0004_conference_logo.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@
88
class Migration(migrations.Migration):
99

1010
dependencies = [
11-
('conferences', '0003_auto_20150113_1120'),
11+
("conferences", "0003_auto_20150113_1120"),
1212
]
1313

1414
operations = [
1515
migrations.AddField(
16-
model_name='conference',
17-
name='logo',
18-
field=models.ImageField(blank=True, null=True, upload_to=uuid_upload_path.storage.upload_to),
16+
model_name="conference",
17+
name="logo",
18+
field=models.ImageField(
19+
blank=True, null=True, upload_to=uuid_upload_path.storage.upload_to
20+
),
1921
preserve_default=True,
2022
),
2123
]

0 commit comments

Comments
 (0)