From d5a55f71a702c12a3cf0f4e12b62b607f01deb77 Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dfelinto@gmail.com>
Date: Wed, 6 Sep 2017 17:51:21 +0200
Subject: [PATCH] Fix Flask and Eve dependency issue

Eve expects 'flask>=0.10.1,<=0.12' so we can't use flask==0.12.2 in
pillar for now.

This needs to be fixed upstream (eve), but for now `python setup.py
install`.
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 2e7fcd0d..6e78994f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ bleach==1.4.3
 celery[redis]==4.0.2
 CommonMark==0.7.2
 Eve==0.7.3
-Flask==0.12.2
+Flask==0.12
 Flask-Cache==0.13.1
 Flask-Script==2.0.5
 Flask-Login==0.3.2
diff --git a/setup.py b/setup.py
index 3c3d8b4a..6c6c1151 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setuptools.setup(
     version='2.0',
     packages=setuptools.find_packages('.', exclude=['test']),
     install_requires=[
-        'Flask>0.12',
+        'Flask>=0.12',
         'Eve>=0.7.3',
         'Flask-Cache>=0.13.1',
         'Flask-Script>=2.0.5',