feat: add tornado and twisted tests

Signed-off-by: Gabor Boros <[email protected]>

Author: gabor-boros

Makefile

@@ -96,14 +96,14 @@ docs: ## generate Sphinx HTML documentation, including API docs
 
 .PHONY: format
 format: ## run formatters on the package
-	isort rethinkdb tests
-	black rethinkdb tests
+	poetry run isort rethinkdb tests
+	poetry run black rethinkdb tests
 
 .PHONY: lint
 lint: ## run linters against the package
-	mypy rethinkdb
-	pylint rethinkdb
-	flake8 rethinkdb --count --show-source --statistics
+	poetry run mypy rethinkdb
+	poetry run pylint rethinkdb || true
+	poetry run flake8 rethinkdb --count --show-source --statistics
 
 .PHONY: protobuf
 protobuf: ## download and convert protobuf file
@@ -113,34 +113,21 @@ protobuf: ## download and convert protobuf file
 .PHONY: generate-init-pyi
 generate-init-pyi: ## generate __init__.pyi file
 	python scripts/generate_init_pyi.py
-	isort rethinkdb/__init__.pyi
-	black rethinkdb/__init__.pyi
+	poetry run isort rethinkdb/__init__.pyi
+	poetry run black rethinkdb/__init__.pyi
 
 .PHONY: test-unit
 test-unit: ## run unit tests and generate coverage
-	coverage run -m pytest -m "not integration" -vv
-	coverage report
+	poetry run coverage run -m pytest -m "not integration" -vv
+	poetry run coverage report
 
 .PHONY: test-integration
 test-integration: ## run unit tests and generate coverage
-	coverage run -m pytest -m "integration" -m "not v2_5" -vv
-	coverage report
+	poetry run coverage run -m pytest -m "integration" -m "not v2_5" -vv
+	poetry run coverage report
 
 .PHONY: test
 test: ## run all tests and generate coverage
-	coverage run -m pytest -m "not v2_5" -vv
-	coverage report
-	coverage xml
-
-.PHONY: download-test-reporter
-download-test-reporter:
-	curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-	chmod +x ./cc-test-reporter
-
-.PHONY: test-reporter-before
-test-reporter-before:
-	./cc-test-reporter before-build
-
-.PHONY: upload-coverage
-upload-coverage:
-	./cc-test-reporter after-build -t "coverage.py"
+	poetry run coverage run -m pytest -m "not v2_5" -vv
+	poetry run coverage report
+	poetry run coverage xml

mypy.ini

@@ -1,2 +1,11 @@
 [mypy]
-exclude = rethinkdb/cli/.*,scripts/.*,.*ql2_pb2\.py
+plugins = pydantic.mypy
+
+[mypy-twisted.*]
+ignore_missing_imports = True
+
+[mypy-tornado.*]    
+ignore_missing_imports = True
+
+[mypy-rethinkdb.net_twisted]
+ignore_errors = True

poetry.lock

@@ -52,6 +52,9 @@ ujson = "^5.10.0"
 click = "^8.2.1"
 pyyaml = "^6.0.2"
 
+twisted = { version = "^25.5", optional = true }
+tornado = { version = "^6.5", optional = true }
+
 [tool.poetry.group.dev.dependencies]
 black = "^25.1"
 coverage = "^7.9"
@@ -61,10 +64,13 @@ mypy = "^1.16"
 pylint = "^3.3"
 pytest = "^8.4"
 sphinx-rtd-theme = "^3.0"
+pytest-twisted = "^1.14"
+pytest-asyncio = "^0.25"
 
 [tool.poetry.extras]
-# Here comes the Trio, Twisted, etc extras
-all = []
+all = ["twisted", "tornado"]
+twisted = ["twisted"]
+tornado = ["tornado"]
 
 [tool.black]
 target-version = ['py312']

pyproject.toml

@@ -5,4 +5,6 @@ python_functions=test_*
 markers =
     unit: Select only unit tests
     integration: Select only integration tests
+    twisted: Select only Twisted tests
+    tornado: Select only Tornado tests
     v2_5: RethinkDB 2.5+ compatible tests

pytest.ini

@@ -15,54 +15,213 @@
 # This file incorporates work covered by the following copyright:
 # Copyright 2010-2016 RethinkDB, all rights reserved.
 
-import warnings
+# pylint: disable=redefined-builtin, unused-import
+
 from types import SimpleNamespace
+import warnings
 
 from rethinkdb import net
-# pylint: disable=redefined-builtin
 from rethinkdb.query import (
-    add, and_, april, args, asc, august, avg, binary, bit_and, bit_not, bit_or,
-    bit_sal, bit_sar, bit_xor, branch, ceil, circle, contains, count, db,
-    db_create, db_drop, db_list, december, desc, distance, distinct, div, do,
-    epoch_time, eq, error, february, floor, format, friday, ge, geojson, grant,
-    group, gt, http, info, intersects, iso8601, january, json, july, june, le,
-    line, literal, lt, make_timezone, map, march, max, maxval, may, min, minval,
-    mod, monday, mul, ne, not_, november, now, object, october, or_, point,
-    polygon, random, range, reduce, round, row, saturday, september, sub, sum,
-    sunday, table, table_create, table_drop, table_list, thursday, time, tuesday,
-    type_of, union, uuid, wednesday, js
+    add,
+    and_,
+    april,
+    args,
+    asc,
+    august,
+    avg,
+    binary,
+    bit_and,
+    bit_not,
+    bit_or,
+    bit_sal,
+    bit_sar,
+    bit_xor,
+    branch,
+    ceil,
+    circle,
+    contains,
+    count,
+    db,
+    db_create,
+    db_drop,
+    db_list,
+    december,
+    desc,
+    distance,
+    distinct,
+    div,
+    do,
+    epoch_time,
+    eq,
+    error,
+    february,
+    floor,
+    format,
+    friday,
+    ge,
+    geojson,
+    grant,
+    group,
+    gt,
+    http,
+    info,
+    intersects,
+    iso8601,
+    january,
+    js,
+    json,
+    july,
+    june,
+    le,
+    line,
+    literal,
+    lt,
+    make_timezone,
+    map,
+    march,
+    max,
+    maxval,
+    may,
+    min,
+    minval,
+    mod,
+    monday,
+    mul,
+    ne,
+    not_,
+    november,
+    now,
+    object,
+    october,
+    or_,
+    point,
+    polygon,
+    random,
+    range,
+    reduce,
+    round,
+    row,
+    saturday,
+    september,
+    sub,
+    sum,
+    sunday,
+    table,
+    table_create,
+    table_drop,
+    table_list,
+    thursday,
+    time,
+    tuesday,
+    type_of,
+    union,
+    uuid,
+    wednesday,
 )
-# pylint: enable=redefined-builtin
+
+# pylint: enable=redefined-builtin, unused-import
 
 __version__ = "2.5.0"
 
 # Create the r namespace object containing all query functions
 r = SimpleNamespace()
 
 query_functions = {
-    'add': add, 'and_': and_, 'april': april, 'args': args, 'asc': asc,
-    'august': august, 'avg': avg, 'binary': binary, 'bit_and': bit_and,
-    'bit_not': bit_not, 'bit_or': bit_or, 'bit_sal': bit_sal, 'bit_sar': bit_sar,
-    'bit_xor': bit_xor, 'branch': branch, 'ceil': ceil, 'circle': circle,
-    'contains': contains, 'count': count, 'db': db, 'db_create': db_create,
-    'db_drop': db_drop, 'db_list': db_list, 'december': december, 'desc': desc,
-    'distance': distance, 'distinct': distinct, 'div': div, 'do': do,
-    'epoch_time': epoch_time, 'eq': eq, 'error': error, 'february': february,
-    'floor': floor, 'format': format, 'friday': friday, 'ge': ge, 'geojson': geojson,
-    'grant': grant, 'group': group, 'gt': gt, 'http': http, 'info': info,
-    'intersects': intersects, 'iso8601': iso8601, 'january': january, 'json': json,
-    'july': july, 'june': june, 'le': le, 'line': line, 'literal': literal,
-    'lt': lt, 'make_timezone': make_timezone, 'map': map, 'march': march,
-    'max': max, 'maxval': maxval, 'may': may, 'min': min, 'minval': minval,
-    'mod': mod, 'monday': monday, 'mul': mul, 'ne': ne, 'not_': not_,
-    'november': november, 'now': now, 'object': object, 'october': october,
-    'or_': or_, 'point': point, 'polygon': polygon, 'random': random,
-    'range': range, 'reduce': reduce, 'round': round, 'row': row,
-    'saturday': saturday, 'september': september, 'sub': sub, 'sum': sum,
-    'sunday': sunday, 'table': table, 'table_create': table_create,
-    'table_drop': table_drop, 'table_list': table_list, 'thursday': thursday,
-    'time': time, 'tuesday': tuesday, 'type_of': type_of, 'union': union,
-    'uuid': uuid, 'wednesday': wednesday, 'js': js
+    "add": add,
+    "and_": and_,
+    "april": april,
+    "args": args,
+    "asc": asc,
+    "august": august,
+    "avg": avg,
+    "binary": binary,
+    "bit_and": bit_and,
+    "bit_not": bit_not,
+    "bit_or": bit_or,
+    "bit_sal": bit_sal,
+    "bit_sar": bit_sar,
+    "bit_xor": bit_xor,
+    "branch": branch,
+    "ceil": ceil,
+    "circle": circle,
+    "contains": contains,
+    "count": count,
+    "db": db,
+    "db_create": db_create,
+    "db_drop": db_drop,
+    "db_list": db_list,
+    "december": december,
+    "desc": desc,
+    "distance": distance,
+    "distinct": distinct,
+    "div": div,
+    "do": do,
+    "epoch_time": epoch_time,
+    "eq": eq,
+    "error": error,
+    "february": february,
+    "floor": floor,
+    "format": format,
+    "friday": friday,
+    "ge": ge,
+    "geojson": geojson,
+    "grant": grant,
+    "group": group,
+    "gt": gt,
+    "http": http,
+    "info": info,
+    "intersects": intersects,
+    "iso8601": iso8601,
+    "january": january,
+    "json": json,
+    "july": july,
+    "june": june,
+    "le": le,
+    "line": line,
+    "literal": literal,
+    "lt": lt,
+    "make_timezone": make_timezone,
+    "map": map,
+    "march": march,
+    "max": max,
+    "maxval": maxval,
+    "may": may,
+    "min": min,
+    "minval": minval,
+    "mod": mod,
+    "monday": monday,
+    "mul": mul,
+    "ne": ne,
+    "not_": not_,
+    "november": november,
+    "now": now,
+    "object": object,
+    "october": october,
+    "or_": or_,
+    "point": point,
+    "polygon": polygon,
+    "random": random,
+    "range": range,
+    "reduce": reduce,
+    "round": round,
+    "row": row,
+    "saturday": saturday,
+    "september": september,
+    "sub": sub,
+    "sum": sum,
+    "sunday": sunday,
+    "table": table,
+    "table_create": table_create,
+    "table_drop": table_drop,
+    "table_list": table_list,
+    "thursday": thursday,
+    "time": time,
+    "tuesday": tuesday,
+    "type_of": type_of,
+    "union": union,
+    "uuid": uuid,
+    "wednesday": wednesday,
+    "js": js,
 }
 
 for name, func in query_functions.items():
@@ -85,7 +244,6 @@ def __init__(self):
         net.Connection._r = self
         self.connection_type = None
 
-        # Ensure the `make_connection` function is not overridden accidentally
         self.make_connection = self.net.make_connection
         self.set_loop_type(None)
 
@@ -103,16 +261,20 @@ def set_loop_type(self, library=None) -> None:
             library = None
 
         if library == "tornado":
-            warnings.warn(f"{library} is not yet supported, using the default one")
-            library = None
+            # pylint: disable=import-outside-toplevel
+            from rethinkdb.net_tornado import Connection as TornadoConnection
+
+            self.connection_type = TornadoConnection
 
         if library == "trio":
             warnings.warn(f"{library} is not yet supported, using the default one")
             library = None
 
         if library == "twisted":
-            warnings.warn(f"{library} is not yet supported, using the default one")
-            library = None
+            # pylint: disable=import-outside-toplevel
+            from rethinkdb.net_twisted import Connection as TwistedConnection
+
+            self.connection_type = TwistedConnection
 
         if library is None or self.connection_type is None:
             self.connection_type = self.net.DefaultConnection