From 2dcc8f9fa94704d2d2619790594fd32e70dc6eb2 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 25 Apr 2024 21:13:33 +0100 Subject: [PATCH] Update pattern in ``utils/bump_docker.py`` --- utils/bump_docker.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/utils/bump_docker.py b/utils/bump_docker.py index 8f385ae3d15..570e5ecab49 100755 --- a/utils/bump_docker.py +++ b/utils/bump_docker.py @@ -26,8 +26,8 @@ for file in DOCKERFILE_BASE, DOCKERFILE_LATEXPDF: content = file.read_text(encoding='utf-8') content = re.sub( - rf'{re.escape(OPENCONTAINERS_VERSION_PREFIX)} = "{VERSION_PATTERN}"', - rf'{OPENCONTAINERS_VERSION_PREFIX} = "{VERSION}"', + rf'{re.escape(OPENCONTAINERS_VERSION_PREFIX)}="{VERSION_PATTERN}"', + rf'{OPENCONTAINERS_VERSION_PREFIX}="{VERSION}"', content, ) content = re.sub( @@ -39,16 +39,13 @@ def git(*args: str) -> None: - ret = subprocess.run( + subprocess.run( ('git', *args), - capture_output=True, cwd=DOCKER_ROOT, check=True, text=True, encoding='utf-8', ) - print(ret.stdout) - print(ret.stderr, file=sys.stderr) git('checkout', 'master')