build: fix protofile download

Signed-off-by: Gabor Boros <gabor.brs@gmail.com>

Author: gabor-boros

CONTRIBUTING.rst

@@ -85,8 +85,8 @@ As `step 0` make sure you have python 3.7+, [https://python-poetry.org/](poetry)
 
 5. When you're done making changes, check that your changes pass linters and the tests::
 
-    $ poetry shell
-    $ make ql2.proto
+    $ poetry env activate
+    $ make protobuf
     $ make format
     $ make lint
     $ make test

Makefile

@@ -106,8 +106,8 @@ lint: ## run linters against the package
 	pylint rethinkdb
 	flake8 rethinkdb --count --show-source --statistics
 
-.PHONY: ql2.proto
-ql2.proto: ## download and convert protobuf file
+.PHONY: protobuf
+protobuf: ## download and convert protobuf file
 	curl -sqo ${TARGET_PROTO_FILE} ${PROTO_FILE_URL}
 	python ${FILE_CONVERTER_NAME} -l python -i ${TARGET_PROTO_FILE} -o ${TARGET_CONVERTED_PROTO_FILE}
 

scripts/convert_protofile.py

@@ -85,9 +85,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<name>\w+) \{")
-    valueRegex = re.compile("\s*(?P<name>\w+)\s*=\s*(?P<value>\w+)")
-    endRegex = re.compile("\s*\}")
+    messageRegex = re.compile(r"\s*(message|enum) (?P<name>\w+) \{")
+    valueRegex = re.compile(r"\s*(?P<name>\w+)\s*=\s*(?P<value>\w+)")
+    endRegex = re.compile(r"\s*\}")
 
     indentLevel = languageDefs[language]["initialIndentLevel"]
     lastIndentLevel = languageDefs[language]["initialIndentLevel"] - 1