From 670b33eb168911ae7ab2493895902eea06b2666d Mon Sep 17 00:00:00 2001 From: Kevin Burke Date: Mon, 6 Aug 2018 10:05:06 -0700 Subject: [PATCH 1/2] Install psycopg2-binary Currently Travis CI builds are failing with a message asking us to install the binary version, so let's give that a try. Remove Python 2.6 and Python 3.3 from the build matrix, as those versions are not supported by the core team or Sphinx. --- .travis.yml | 8 -------- requirements/test-cpython.txt | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) 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 From f9abb96d1d653bb587073fdf86c5b21e6c096d65 Mon Sep 17 00:00:00 2001 From: Kevin Burke Date: Mon, 6 Aug 2018 10:18:11 -0700 Subject: [PATCH 2/2] Lock down Flask version This project is not compatible with Flask 1. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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__))