From c978af710ebd4567bae1a16fc95daf2ef211a972 Mon Sep 17 00:00:00 2001 From: Gabor Boros Date: Sun, 10 Dec 2023 09:44:01 +0400 Subject: [PATCH 1/3] chore: correct the version number Signed-off-by: Gabor Boros --- rethinkdb/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rethinkdb/version.py b/rethinkdb/version.py index bf0c23c..572868c 100644 --- a/rethinkdb/version.py +++ b/rethinkdb/version.py @@ -15,4 +15,4 @@ # This file incorporates work covered by the following copyright: # Copyright 2010-2016 RethinkDB, all rights reserved. -VERSION = "2.4.11+source" +VERSION = "2.4.10.post1+source" From f6cbffc90bfb5b2435ee31df25af8d8c66def9cb Mon Sep 17 00:00:00 2001 From: Gabor Boros Date: Sun, 10 Dec 2023 09:56:13 +0400 Subject: [PATCH 2/3] chore: simplify regex for rethinkdb case Signed-off-by: Gabor Boros --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 23f505e..ded5627 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ RETHINKDB_VERSION_DESCRIBE = os.environ.get("RETHINKDB_VERSION_DESCRIBE") -VERSION_RE = r"(?P[0-9]+)\.(?P[0-9]+)\.(?P[0-9]+)(?P:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?P:\+[0-9A-Za-z-]+)?" +VERSION_RE = r"(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?Ppost[1-9]\d*)" with open("rethinkdb/version.py", "r") as f: version_parts = re.search(VERSION_RE, f.read()).groups() From 339cd9a8b895ed3b1d74b2d8878eb7f0a5d4a9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boros?= Date: Thu, 22 May 2025 10:09:35 +0400 Subject: [PATCH 3/3] fix: add r strings for regex escape (#313) --- scripts/convert_protofile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/convert_protofile.py b/scripts/convert_protofile.py index 98f676e..ec80b3e 100644 --- a/scripts/convert_protofile.py +++ b/scripts/convert_protofile.py @@ -86,9 +86,9 @@ def convertFile(inputFile, outputFile, language): assert(outputFile is not None and hasattr(outputFile, 'write')) assert(language in languageDefs) - messageRegex = re.compile('\s*(message|enum) (?P\w+) \{') - valueRegex = re.compile('\s*(?P\w+)\s*=\s*(?P\w+)') - endRegex = re.compile('\s*\}') + messageRegex = re.compile(r'\s*(message|enum) (?P\w+) \{') + valueRegex = re.compile(r'\s*(?P\w+)\s*=\s*(?P\w+)') + endRegex = re.compile(r'\s*\}') indentLevel = languageDefs[language]["initialIndentLevel"] lastIndentLevel = languageDefs[language]["initialIndentLevel"] - 1