Merge pull request #79 from evo-company/basic-support-sqlalchemy1.4

basic support for sqlalchemy1.4

hiku/sources/sqlalchemy.py

@@ -12,7 +12,6 @@
 )
 
 import sqlalchemy
-from sqlalchemy.engine import RowProxy
 from sqlalchemy.sql import Select
 from sqlalchemy.sql.elements import BinaryExpression
 
@@ -36,6 +35,13 @@
     Context,
 )
 
+SQLALCHEMY_VERSION = tuple(map(int, sqlalchemy.__version__.split('.')))
+
+if SQLALCHEMY_VERSION >= (1, 4):
+    from sqlalchemy.engine.row import Row
+else:
+    from sqlalchemy.engine import RowProxy as Row
+
 
 def _translate_type(
     column: sqlalchemy.Column
@@ -104,7 +110,7 @@ def select_expr(
             .where(self.in_impl(self.primary_key, ids))
         )
 
-        def result_proc(rows: List[RowProxy]) -> List:
+        def result_proc(rows: List[Row]) -> List:
             rows_map = {row[self.primary_key]: [row[c] for c in columns]
                         for row in rows}
 

requirements.in

@@ -1,5 +1,5 @@
 graphql-core
-sqlalchemy
+sqlalchemy>=1.3.9
 protobuf
 aiopg
 prometheus-client

tox.ini

@@ -1,10 +1,17 @@
 [tox]
-envlist = py37,pypy3,py38,py39,py310
+envlist = py37,pypy3,py38,py39,py310,py310_sqlalchemy14
 
 [testenv]
 commands = py.test tests {posargs}
 deps = -r requirements-tox.txt
 
+[testenv:py310_sqlalchemy14]
+deps =
+    -r requirements-tox.txt
+commands =
+    pip install sqlalchemy==1.4.40
+    py.test tests {posargs}
+
 [testenv:flake8]
 commands = flake8
 deps = flake8==5.0.3
@@ -36,7 +43,7 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39
-    3.10: py310
+    3.10: py310,py310_sqlalchemy14
 
 [coverage:run]
 branch = True