Merge 149a937 into 8e32477

jfinkels · Aug 6, 2018 · 2db0cef · 2db0cef
2 parents 8e32477 + 149a937
commit 2db0cef
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,7 @@ cache: pip
 language: python
 
 python:
-  - "2.6"
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"

diff --git a/requirements/test-cpython.txt b/requirements/test-cpython.txt
@@ -1,2 +1,2 @@
 -r test.txt
-psycopg2
+psycopg2-binary
diff --git a/setup.py b/setup.py
@@ -43,7 +43,7 @@
 
 #: The installation requirements for Flask-Restless. Flask-SQLAlchemy is not
 #: required, so the user must install it explicitly.
-REQUIREMENTS = ['flask>=0.10', 'sqlalchemy>=0.8', 'python-dateutil>2.2']
+REQUIREMENTS = ['flask>=0.10,<=0.12.4', 'sqlalchemy>=0.8', 'python-dateutil>2.2']
 
 #: The absolute path to this file.
 HERE = os.path.abspath(os.path.dirname(__file__))