Skip to content

[pull] main from ietf-tools:main #229

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Jun 11, 2026
Merged

[pull] main from ietf-tools:main #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4641d0d
ci: merge main to release
jennifer-richards Jun 11, 2026
e79b057
fix: include draft revision in rfc json (#11024)
rjsparks Jun 11, 2026
dd157b1
ci: merge release to main
jennifer-richards Jun 11, 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
14 changes: 14 additions & 0 deletions ietf/doc/tests_utils_rfc_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
RfcAuthorFactory,
RfcFactory,
RgRfcFactory,
WgDraftFactory,
WgRfcFactory,
)
from ietf.doc.models import RelatedDocument
Expand Down Expand Up @@ -199,6 +200,19 @@ def test_errata_url_set_when_errata_exist(self):
f"https://www.rfc-editor.org/errata/rfc{rfc.rfc_number}",
)

def test_draft_field_includes_revision(self):
"""draft field is '<name>-<rev>' when the RFC originated from a draft."""
draft = WgDraftFactory(rev="07")
rfc = PublishedRfcDocEventFactory(doc=WgRfcFactory()).doc
draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
_put_pub_levels(rfc.rfc_number, "ps")
_put_empty_errata()

generate_rfc_json(rfc.rfc_number)
data = _read_json(rfc.rfc_number)

self.assertEqual(data["draft"], f"{draft.name}-07")

def test_errata_url_none_when_no_errata(self):
"""errata_url is None when errata.json has no entries for the RFC."""
rfc = PublishedRfcDocEventFactory(doc=WgRfcFactory()).doc
Expand Down
2 changes: 1 addition & 1 deletion ietf/doc/utils_rfc_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def generate_rfc_json(rfc_number: int, *, pub_levels=None) -> None:

# draft name
draft_doc = rfc.came_from_draft()
draft = draft_doc.name if draft_doc else None
draft = f"{draft_doc.name}-{draft_doc.rev}" if draft_doc else None

# authors: ordered list of display strings
authors = []
Expand Down
Loading