Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lock down Flask version #690

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ cache: pip
language: python

python:
- "2.6"
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion requirements/test-cpython.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
-r test.txt
psycopg2
psycopg2-binary
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (81 > 79 characters)


#: The absolute path to this file.
HERE = os.path.abspath(os.path.dirname(__file__))
Expand Down