diff --git a/rethinkdb/version.py b/rethinkdb/version.py index bf0c23cc..572868c2 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" diff --git a/scripts/convert_protofile.py b/scripts/convert_protofile.py index 98f676e3..ec80b3e8 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 diff --git a/setup.py b/setup.py index 23f505e2..ded5627f 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()