Skip to content

Commit 8779c2e

Browse files
tarkatronicauvipy
authored andcommitted
Add on_delete to ForeignKeys, plus other fixes (#44)
* Fix the tests so they complete again * Add explicit support for Django 1.11 * Add an explicit on_delete to ForeignKeys * Add myself to the AUTHORS list
1 parent 0791146 commit 8779c2e

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Jeffrey Hu <[email protected]>
4646
4747
Jerzy Kozera <[email protected]>
4848
Jesper Noehr <[email protected]>
49+
Joey Wilhelm <[email protected]>
4950
John Andrews <johna@stjit011.(none)>
5051
John Watson <[email protected]>
5152
Jonas Haag <[email protected]>

django_celery_beat/models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,16 @@ class PeriodicTask(models.Model):
224224
)
225225
task = models.CharField(_('task name'), max_length=200)
226226
interval = models.ForeignKey(
227-
IntervalSchedule,
227+
IntervalSchedule, on_delete=models.CASCADE,
228228
null=True, blank=True, verbose_name=_('interval'),
229229
)
230230
crontab = models.ForeignKey(
231-
CrontabSchedule, null=True, blank=True, verbose_name=_('crontab'),
232-
help_text=_('Use one of interval/crontab'),
231+
CrontabSchedule, on_delete=models.CASCADE, null=True, blank=True,
232+
verbose_name=_('crontab'), help_text=_('Use one of interval/crontab'),
233233
)
234234
solar = models.ForeignKey(
235-
SolarSchedule, null=True, blank=True, verbose_name=_('solar'),
236-
help_text=_('Use a solar schedule')
235+
SolarSchedule, on_delete=models.CASCADE, null=True, blank=True,
236+
verbose_name=_('solar'), help_text=_('Use a solar schedule')
237237
)
238238
args = models.TextField(
239239
_('Arguments'), blank=True, default='[]',

requirements/test-django111.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
django>=1.11,<2.0

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def _pyimp():
5050
Framework :: Django :: 1.8
5151
Framework :: Django :: 1.9
5252
Framework :: Django :: 1.10
53+
Framework :: Django :: 1.11
5354
Operating System :: OS Independent
5455
Topic :: Communications
5556
Topic :: System :: Distributed Computing

t/unit/test_schedulers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ def test_entry(self):
106106
assert e.options['routing_key'] == 'cpu'
107107

108108
right_now = self.app.now()
109+
# Entry.last_run_at returns naive tz, so make this naive for comparison
110+
right_now = right_now.replace(tzinfo=None)
109111
m2 = self.create_model_interval(
110112
schedule(timedelta(seconds=10)),
111113
last_run_at=right_now,

tox.ini

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
[tox]
22
envlist =
3+
2.7-django1.11
34
2.7-django1.10
45
2.7-django1.9
56
2.7-django1.8
7+
pypy-django1.11
68
pypy-django1.10
79
pypy-django1.9
810
pypy-django1.8
11+
3.4-django1.11
912
3.4-django1.10
1013
3.4-django1.9
1114
3.4-django1.8
12-
3.4-django1.10
15+
3.5-django1.11
16+
3.5-django1.10
1317
3.5-django1.9
1418
3.5-django1.8
1519

@@ -27,6 +31,7 @@ deps=
2731

2832
cov: -r{toxinidir}/requirements/test-django.txt
2933

34+
django1.11: -r{toxinidir}/requirements/test-django111.txt
3035
django1.10: -r{toxinidir}/requirements/test-django110.txt
3136
django1.9: -r{toxinidir}/requirements/test-django19.txt
3237
django1.8: -r{toxinidir}/requirements/test-django18.txt

0 commit comments

Comments
 (0)