From 3d5e92f3fb0f58a149483675e50444b0ace8aba6 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Thu, 7 Mar 2019 22:25:03 -0800 Subject: [PATCH 1/2] Bump sqlalchemy dep --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 93181d6c9fbc..25186dba56ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -62,7 +62,7 @@ selenium==3.141.0 simplejson==3.15.0 six==1.11.0 # via bleach, cryptography, isodate, pathlib2, polyline, pydruid, python-dateutil, sqlalchemy-utils, wtforms-json sqlalchemy-utils==0.32.21 -sqlalchemy==1.2.2 +sqlalchemy==1.2.18 sqlparse==0.2.4 unicodecsv==0.14.1 urllib3==1.22 # via requests, selenium diff --git a/setup.py b/setup.py index 7d72dbe11d24..4cb67a5560cf 100644 --- a/setup.py +++ b/setup.py @@ -100,7 +100,7 @@ def get_git_sha(): 'retry>=0.9.2', 'selenium>=3.141.0', 'simplejson>=3.15.0', - 'sqlalchemy', + 'sqlalchemy>=1.2.18, <2.0.0', 'sqlalchemy-utils', 'sqlparse', 'unicodecsv', From 96f5e94fe685bd1f0965088126e5c932424fa5dd Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Sat, 9 Mar 2019 11:07:50 -0800 Subject: [PATCH 2/2] Addressing comments --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4cb67a5560cf..7b6be5e55ea3 100644 --- a/setup.py +++ b/setup.py @@ -100,7 +100,7 @@ def get_git_sha(): 'retry>=0.9.2', 'selenium>=3.141.0', 'simplejson>=3.15.0', - 'sqlalchemy>=1.2.18, <2.0.0', + 'sqlalchemy>=1.2.18, <1.3.0', 'sqlalchemy-utils', 'sqlparse', 'unicodecsv',