From 66f167aa35caae60b65d43e2e2f134fc7cdf1e97 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Tue, 21 Oct 2025 13:30:48 +0100 Subject: [PATCH 1/4] Ensure README changes don't affect whitespace --- release.py | 4 ++-- tests/test_release.py | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/release.py b/release.py index 8652c23b..a26e3a3b 100755 --- a/release.py +++ b/release.py @@ -446,9 +446,9 @@ def tweak_readme(tag: Tag, filename: str = "README.rst") -> None: print(f"Updating {filename}...", end=" ") readme = Path(filename) - # Update first line: "This is Python version 3.14.0 alpha 7" + # Update first line: "This is Python version X.Y.Z {release_level} N" # and update length of underline in second line to match. - lines = readme.read_text().splitlines() + lines = readme.read_text(encoding="utf-8").split("\n") this_is = f"This is Python version {tag.long_name}" underline = "=" * len(this_is) lines[0] = this_is diff --git a/tests/test_release.py b/tests/test_release.py index 1947f0dd..92814f7b 100644 --- a/tests/test_release.py +++ b/tests/test_release.py @@ -102,7 +102,7 @@ def test_tweak_readme( tag = release.Tag(test_tag) original_readme_file = Path(__file__).parent / "README.rst" - original_contents = original_readme_file.read_text() + original_contents = original_readme_file.read_text(encoding="utf-8") readme_file = tmp_path / "README.rst" readme_file.write_text(original_contents) @@ -110,8 +110,11 @@ def test_tweak_readme( release.tweak_readme(tag, filename=str(readme_file)) # Assert - original_lines = original_contents.splitlines() - new_lines = readme_file.read_text().splitlines() + original_lines = original_contents.split("\n") + new_contents = readme_file.read_text(encoding="utf-8") + new_lines = new_contents.split("\n") assert new_lines[0] == expected_version assert new_lines[1] == expected_underline assert new_lines[2:] == original_lines[2:] + assert original_contents.endswith("\n") + assert new_contents.endswith("\n") From 5a23a36a343160d66883fcc8e1f94b585b99908c Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Wed, 12 Nov 2025 16:30:42 +0000 Subject: [PATCH 2/4] no need for encoding arg Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.py b/release.py index a26e3a3b..50a76fd4 100755 --- a/release.py +++ b/release.py @@ -448,7 +448,7 @@ def tweak_readme(tag: Tag, filename: str = "README.rst") -> None: # Update first line: "This is Python version X.Y.Z {release_level} N" # and update length of underline in second line to match. - lines = readme.read_text(encoding="utf-8").split("\n") + lines = readme.read_text().split("\n") this_is = f"This is Python version {tag.long_name}" underline = "=" * len(this_is) lines[0] = this_is From 06b3be7ecb6a3d3d279cea1053871d5ae831466c Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Wed, 12 Nov 2025 16:30:53 +0000 Subject: [PATCH 3/4] ditto Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- tests/test_release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_release.py b/tests/test_release.py index 92814f7b..b47877fb 100644 --- a/tests/test_release.py +++ b/tests/test_release.py @@ -102,7 +102,7 @@ def test_tweak_readme( tag = release.Tag(test_tag) original_readme_file = Path(__file__).parent / "README.rst" - original_contents = original_readme_file.read_text(encoding="utf-8") + original_contents = original_readme_file.read_text() readme_file = tmp_path / "README.rst" readme_file.write_text(original_contents) From df608d06d23d311395c0325e973ea87163107ccb Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Wed, 12 Nov 2025 16:31:01 +0000 Subject: [PATCH 4/4] and again Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- tests/test_release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_release.py b/tests/test_release.py index b47877fb..c72289ae 100644 --- a/tests/test_release.py +++ b/tests/test_release.py @@ -111,7 +111,7 @@ def test_tweak_readme( # Assert original_lines = original_contents.split("\n") - new_contents = readme_file.read_text(encoding="utf-8") + new_contents = readme_file.read_text() new_lines = new_contents.split("\n") assert new_lines[0] == expected_version assert new_lines[1] == expected_underline