From c82af7d87123289f0e557efbf786897c66272b6f Mon Sep 17 00:00:00 2001 From: Bart Hertog Date: Tue, 5 Dec 2023 21:42:29 +0100 Subject: [PATCH] Resolved a merge conflict. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c72b888..55aa904 100644 --- a/setup.py +++ b/setup.py @@ -75,7 +75,7 @@ def check_protoc_version(): print("Stopping the setup.") exit(0) - version_re_compiled = re.compile(r".*\s(?P\d+)\.(?P\d+)") + version_re_compiled = re.compile(r".*\s(?P\d+)\.(?P\d+)(?:\.(?P\d+))?") installed_version = version_re_compiled.search(output.stdout.decode("utf-8")) required_version = read_required_version()