diff --git a/src/blurb/_blurb_file.py b/src/blurb/_blurb_file.py index b0015b9..21f601d 100644 --- a/src/blurb/_blurb_file.py +++ b/src/blurb/_blurb_file.py @@ -33,7 +33,7 @@ Format of the BODY section: * The BODY section should be a single paragraph of English text - in ReST format. It should not use the following ReST markup + in reST format. It should not use the following reST markup features: * section headers * comments @@ -49,7 +49,7 @@ (This formatting will be inserted when rendering the final output.) * Lines longer than 76 characters will be wordwrapped. * In the final output, the first line will have - "- gh-issue-: " inserted at the front, + "- :gh:``: " inserted at the front, and subsequent lines will have two spaces inserted at the front. diff --git a/src/blurb/_merge.py b/src/blurb/_merge.py index b18f483..21a55ab 100644 --- a/src/blurb/_merge.py +++ b/src/blurb/_merge.py @@ -44,15 +44,6 @@ def write_news(output: str, *, versions: list[str]) -> None: def prnt(msg: str = '', /): buff.append(msg) - prnt( - """ -+++++++++++ -Python News -+++++++++++ - -""".strip() - ) - for version in versions: filenames = glob_blurbs(version) @@ -70,7 +61,7 @@ def prnt(msg: str = '', /): assert len(filenames) == 1 blurbs.load(filenames[0]) - header = f"What's New in Python {printable_version(version)}?" + header = printable_version(version) prnt() prnt(header) prnt('=' * len(header)) @@ -98,11 +89,11 @@ def prnt(msg: str = '', /): if metadata.get('gh-issue'): issue_number = metadata['gh-issue'] if int(issue_number): - body = f'gh-{issue_number}: {body}' + body = f":gh:`{issue_number}`: {body}" elif metadata.get('bpo'): issue_number = metadata['bpo'] if int(issue_number): - body = f'bpo-{issue_number}: {body}' + body = f":issue:`{issue_number}`: {body}" body = f'- {body}' text = textwrap_body(body, subsequent_indent=' ')