Upgrade SQLAlchemy dependency to 1.3.17

Author: autophagy

.github/workflows/main.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        sqla-version: ['1.1.15', '1.2.18']
+        sqla-version: ['1.1.15', '1.2.18', '1.3.17']
         python-version: [3.5, 3.6, 3.7, 3.8]
 
     steps:

CHANGES.txt

@@ -5,6 +5,8 @@ Changes for crate
 Unreleased
 ==========
 
+- Upgraded SQLAlchemy support to 1.3.
+
 - Added ``backoff_factor`` in connection to configure retry interval.
 
 - Added official Python 3.8 support.

setup.py

@@ -69,7 +69,7 @@ def read(path):
     extras_require=dict(
         test=['zope.testing',
               'zc.customdoctests>=1.0.1'],
-        sqlalchemy=['sqlalchemy>=1.0,<1.3']
+        sqlalchemy=['sqlalchemy>=1.0,<1.4']
     ),
     python_requires='>=3.4',
     install_requires=requirements,

src/crate/client/doctests/sqlalchemy.txt

@@ -242,10 +242,11 @@ To search on multiple columns you have to pass a dictionary with columns
 and ``boost`` attached. ``boost`` is a factor that increases the
 relevance of a column in respect to the other columns::
 
+    >>> from sqlalchemy.sql import text
     >>> session.query(Character.name) \
     ...           .filter(match({Character.name_ft: 1.5, Character.quote_ft: 0.1},
     ...                         'Arthur')) \
-    ...     .order_by(sa.desc('_score')) \
+    ...     .order_by(sa.desc(text('_score'))) \
     ...     .all()
     [('Arthur Dent',), ('Tricia McMillan',)]
 

src/crate/client/sqlalchemy/tests/compiler_test.py

@@ -24,7 +24,7 @@
 from crate.client.sqlalchemy.compiler import crate_before_execute
 
 import sqlalchemy as sa
-from sqlalchemy.sql import update
+from sqlalchemy.sql import update, text
 
 from crate.client.sqlalchemy.types import Craty
 
@@ -39,7 +39,7 @@ def setUp(self):
                                 sa.Column('name', sa.String),
                                 sa.Column('data', Craty))
 
-        self.update = update(self.mytable, 'where name=:name')
+        self.update = update(self.mytable, text('where name=:name'))
         self.values = [{'name': 'crate'}]
         self.values = (self.values, )
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{py,34,35,36,37,38}-sa_{1_0,1_1,1_2}
+envlist = py{py,34,35,36,37,38}-sa_{1_0,1_1,1_2,1_3}
 
 [testenv]
 usedevelop = True
@@ -11,6 +11,7 @@ deps =
     sa_1_0: sqlalchemy>=1.0,<1.1
     sa_1_1: sqlalchemy>=1.1,<1.2
     sa_1_2: sqlalchemy>=1.2,<1.3
+    sa_1_3: sqlalchemy>=1.3,<1.4
     mock
     urllib3
 commands =

versions.cfg

@@ -9,7 +9,7 @@ Jinja2 = 2.7.3
 MarkupSafe = 0.23
 Pygments = 1.6
 Sphinx = 1.2.3
-SQLAlchemy = 1.2.0
+SQLAlchemy = 1.3.17
 coverage = 5.0.3
 crate-docs-theme = 0.5.0
 createcoverage = 1.5