diff --git a/.travis.yml b/.travis.yml index 487044b7..4350a661 100644 --- 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" @@ -19,12 +17,6 @@ python: matrix: include: - - python: "2.6" - env: WITHSIMPLEJSON=false WITHFUTURE=true - - python: "2.6" - env: WITHSIMPLEJSON=true WITHFUTURE=false - - python: "2.6" - env: WITHSIMPLEJSON=true WITHFUTURE=true - python: "2.7" env: WITHFUTURE=true diff --git a/requirements/test-cpython.txt b/requirements/test-cpython.txt index 29fa16cc..e0ad6006 100644 --- 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 index 6b52f0c1..9a2954f0 100644 --- 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__))