From f5353e01f95fbc5bdbd770c4f9f1ea6cedc89e17 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 23 Jun 2020 02:16:57 +0200 Subject: [PATCH] post_version.py: drop incorrect conf.py changes This needs to be done in the mesa3d.org repo; see https://gitlab.freedesktop.org/mesa/mesa3d.org/-/merge_requests/19 Signed-off-by: Eric Engestrom Part-of: --- bin/post_version.py | 28 ---------------------------- docs/releasing.rst | 8 ++++---- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/bin/post_version.py b/bin/post_version.py index 553a121714a..67eec783e49 100755 --- a/bin/post_version.py +++ b/bin/post_version.py @@ -26,33 +26,6 @@ import pathlib import subprocess -def update_homepage(version: str) -> None: - p = pathlib.Path(__file__).parent.parent / 'docs' / 'conf.py' - - # Don't post release candidates to the homepage - if 'rc' in version: - return - - with open(p, 'r') as f: - conf = f.readlines() - - new_conf = [] - for line in conf: - if line.startswith("version = '") and line.endswith("'\n"): - old_version = line.split("'")[1] - # Avoid overwriting 20.1.0 when releasing 20.0.8 - # TODO: we might need more than that to handle 20.0.10 - if old_version < version: - line = f"version = '{version}'\n" - new_conf.append(line) - - with open(p, 'w') as f: - for line in new_conf: - f.write(line) - - subprocess.run(['git', 'add', p]) - - def update_release_notes(version: str) -> None: p = pathlib.Path(__file__).parent.parent / 'docs' / 'relnotes.rst' @@ -108,7 +81,6 @@ def main() -> None: parser.add_argument('version', help="The released version.") args = parser.parse_args() - update_homepage(args.version) update_calendar(args.version) done = 'update calendar' diff --git a/docs/releasing.rst b/docs/releasing.rst index 44ef53321b4..b7a4af3be15 100644 --- a/docs/releasing.rst +++ b/docs/releasing.rst @@ -314,10 +314,10 @@ Then run the ./bin/post_version.py X.Y.Z -, where X.Y.Z is the version you just made. This will updated -docs/relnotes.rst, docs/index.rst, and docs/release-calendar.rst. It -will then generate a git commit automatically. Check that everything -looks correct and push: +, where X.Y.Z is the version you just made. This will update +docs/relnotes.rst and docs/release-calendar.rst. It will then generate +a git commit automatically. Check that everything looks correct and +push: :: -- 2.30.2