Skip to content

Commit 0ded019

Browse files
azmeukauvipy
authored andcommitted
Fixed a bunch of django 2.0 deprecations. (#461)
1 parent e64c029 commit 0ded019

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

Changelog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545

4646
Fix contributed by Lev Berman
4747

48+
- Fixed some django 2.0 deprecations.
49+
50+
Fix contributed by Éloi Rivard
51+
4852
.. _version-3.1.17:
4953

5054
3.1.17

djcelery/migrations/0001_initial.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ class Migration(migrations.Migration):
5959
('total_run_count', models.PositiveIntegerField(default=0, editable=False)),
6060
('date_changed', models.DateTimeField(auto_now=True)),
6161
('description', models.TextField(verbose_name='description', blank=True)),
62-
('crontab', models.ForeignKey(blank=True, to='djcelery.CrontabSchedule', help_text='Use one of interval/crontab', null=True, verbose_name='crontab')),
63-
('interval', models.ForeignKey(verbose_name='interval', blank=True, to='djcelery.IntervalSchedule', null=True)),
62+
('crontab', models.ForeignKey(blank=True, to='djcelery.CrontabSchedule', help_text='Use one of interval/crontab', null=True, verbose_name='crontab', on_delete=models.CASCADE)),
63+
('interval', models.ForeignKey(verbose_name='interval', blank=True, to='djcelery.IntervalSchedule', null=True, on_delete=models.CASCADE)),
6464
],
6565
options={
6666
'verbose_name': 'periodic task',
@@ -157,7 +157,7 @@ class Migration(migrations.Migration):
157157
migrations.AddField(
158158
model_name='taskstate',
159159
name='worker',
160-
field=models.ForeignKey(verbose_name='worker', to='djcelery.WorkerState', null=True),
160+
field=models.ForeignKey(verbose_name='worker', to='djcelery.WorkerState', null=True, on_delete=models.CASCADE),
161161
preserve_default=True,
162162
),
163163
]

djcelery/models.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,11 @@ class PeriodicTask(models.Model):
215215
interval = models.ForeignKey(
216216
IntervalSchedule,
217217
null=True, blank=True, verbose_name=_('interval'),
218+
on_delete=models.CASCADE,
218219
)
219220
crontab = models.ForeignKey(
220221
CrontabSchedule, null=True, blank=True, verbose_name=_('crontab'),
222+
on_delete=models.CASCADE,
221223
help_text=_('Use one of interval/crontab'),
222224
)
223225
args = models.TextField(
@@ -352,6 +354,7 @@ class TaskState(models.Model):
352354
retries = models.IntegerField(_('number of retries'), default=0)
353355
worker = models.ForeignKey(
354356
WorkerState, null=True, verbose_name=_('worker'),
357+
on_delete=models.CASCADE,
355358
)
356359
hidden = models.BooleanField(editable=False, default=False, db_index=True)
357360

0 commit comments

Comments
 (0)