Skip to content

fix: identify editorial drafts that should not expire #10388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jennifer-richards merged 2 commits into from
Feb 10, 2026
Merged

fix: identify editorial drafts that should not expire #10388

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f84797
fix: identify editorial drafts that should not expire
rjsparks Feb 9, 2026
63e6d48
Merge branch 'main' into editorialexpiration
jennifer-richards Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 37 additions & 13 deletions ietf/doc/expire.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,46 @@ def expirable_drafts(queryset=None):
# Populate this first time through (but after django has been set up)
if nonexpirable_states is None:
# all IESG states except I-D Exists and Dead block expiry
nonexpirable_states = list(State.objects.filter(used=True, type="draft-iesg").exclude(slug__in=("idexists", "dead")))
nonexpirable_states = list(
State.objects.filter(used=True, type="draft-iesg").exclude(
slug__in=("idexists", "dead")
)
)
# sent to RFC Editor and RFC Published block expiry (the latter
# shouldn't be possible for an active draft, though)
nonexpirable_states += list(State.objects.filter(used=True, type__in=("draft-stream-iab", "draft-stream-irtf", "draft-stream-ise"), slug__in=("rfc-edit", "pub")))
nonexpirable_states += list(
State.objects.filter(
used=True,
type__in=(
"draft-stream-iab",
"draft-stream-irtf",
"draft-stream-ise",
"draft-stream-editorial",
),
slug__in=("rfc-edit", "pub"),
)
)
# other IRTF states that block expiration
nonexpirable_states += list(State.objects.filter(used=True, type_id="draft-stream-irtf", slug__in=("irsgpoll", "iesg-rev",)))

return queryset.filter(
states__type="draft", states__slug="active"
).exclude(
expires=None
).exclude(
states__in=nonexpirable_states
).exclude(
tags="rfc-rev" # under review by the RFC Editor blocks expiry
).distinct()
nonexpirable_states += list(
State.objects.filter(
used=True,
type_id="draft-stream-irtf",
slug__in=(
"irsgpoll",
"iesg-rev",
),
)
)

return (
queryset.filter(states__type="draft", states__slug="active")
.exclude(expires=None)
.exclude(states__in=nonexpirable_states)
.exclude(
tags="rfc-rev" # under review by the RFC Editor blocks expiry
)
.distinct()
)


def get_soon_to_expire_drafts(days_of_warning):
Expand Down
Loading