Skip to content

Commit d798196

Browse files
committed
Merged in [16703] from sasha@dashcare.nl:
Ref ietf-tools#2231 - Fix send-review-reminders and add it to daily cron This fixes a syntax error and a Python 3 incompatibility, and adds send-review-reminders to the daily cron script. Important notes: - I have not tested to what degree the existing reminders work as they should, as that's out of scope. It does have tests. - I can't assess whether the virtualenv activation works in the production setup, and it may be obsolete as bin/daily also activates the virtualenv. - The same Python 3 incompatibility (execfile() no longer exists) seems to exist in various other scripts. - Legacy-Id: 16821 Note: SVN reference [16703] has been migrated to Git commit 296b126
2 parents 9e43474 + 296b126 commit d798196

5 files changed

Lines changed: 12 additions & 5 deletions

File tree

bin/daily

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,5 @@ $DTDIR/ietf/bin/rfc-editor-index-updates -d 1969-01-01
5050
# Fetch meeting attendance data from ietf.org/registration/attendees
5151
$DTDIR/ietf/manage.py fetch_meeting_attendance --latest 2
5252

53+
# Send reminders originating from the review app
54+
$DTDIR/ietf/bin/send-review-reminders

bin/mergeready

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ for key in keys:
373373
i = unmerged_branch_commits[branch].index(rev)
374374
if not i == 0:
375375
unmerged = True
376-
sys.stderr.write("There are unmerged commits ahead of r%s on branch %s:\n" % (rev, branch))
376+
sys.stderr.write("There are unmerged commits ahead of r%s on branch ^/%s:\n" % (rev, branch))
377377
for j in range(0,i):
378378
commit = unmerged_branch_commits[branch][j]
379379
if commit != rev:

hold-for-merge

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# -*- conf-mode -*-
22

3+
/personal/rjs/6.104.1.dev0@16809 # Local changes, not for merge
34
/personal/rjs/6.103.1.dev0@16761 # Fixed in a different manner in [16757]
45

56
/personal/rcross/6.99.2.dev0@16607 # Code review found an issue

ietf/bin/send-review-reminders

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env python
22

3-
import os, sys
3+
import os
4+
import sys
45
import syslog
56

67
# boilerplate
@@ -10,7 +11,9 @@ os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
1011

1112
virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
1213
if os.path.exists(virtualenv_activation):
13-
execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
14+
with open(virtualenv_activation, 'rb') as f:
15+
code = compile(f.read(), virtualenv_activation, 'exec')
16+
exec(code, globals=dict(__name__="__main__", __file__=virtualenv_activation))
1417

1518
syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
1619

@@ -27,11 +30,10 @@ today = datetime.date.today()
2730

2831
for assignment in review_assignments_needing_reviewer_reminder(today):
2932
email_reviewer_reminder(assignment.review_request)
30-
for review_assignment in assignments.review_req.reviewassignment_set.all():
33+
for review_assignment in assignment.review_req.reviewassignment_set.all():
3134
print("Emailed reminder to {} for review of {} in {} (req. id {})".format(review_assignment.reviewer.address, assignment.review_req.doc_id, assignment.review_req.team.acronym, assignment.review_req.pk))
3235

3336
for assignment, secretary_role in review_assignments_needing_secretary_reminder(today):
3437
email_secretary_reminder(assignment.review_request, secretary_role)
3538
review_req = assignment.review_request
3639
print("Emailed reminder to {} for review of {} in {} (req. id {})".format(secretary_role.email.address, review_req.doc_id, review_req.team.acronym, review_req.pk))
37-

ready-for-merge

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
# --- Add entries at the top ---
99

10+
/personal/rjs/6.104.1.dev0@16810
11+
1012
/branch/dash/main@16670
1113

1214
/personal/rjs/6.100.1.dev0@16629

0 commit comments

Comments
 (0)