From 406d572a7be216791834035d252bad61a8132878 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Thu, 10 Aug 2017 09:48:49 -0700 Subject: [PATCH 1/2] keep sqlalchemy version from floating upward --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 53f7775c..ef504312 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,5 @@ tornado>=4.1 jinja2 pamela python-oauth2>=1.0 -sqlalchemy>=1.2.0b2 +SQLAlchemy>=1.0,<1.2 requests From 0b67546481881c9c3d39dfd0261d31b848e8bbf8 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Fri, 11 Aug 2017 06:08:52 -0700 Subject: [PATCH 2/2] Allow sqlalchemy to float upward --- .travis.yml | 1 + requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9b7e6548..7d5ca419 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ before_install: install: - pip install -U pip - pip install --pre -r dev-requirements.txt . + - pip freeze # running tests script: diff --git a/requirements.txt b/requirements.txt index ef504312..b5113c1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,5 @@ tornado>=4.1 jinja2 pamela python-oauth2>=1.0 -SQLAlchemy>=1.0,<1.2 +SQLAlchemy>=1.0 requests