Merge pull request apache#11 in TP/incubator-airflow from feature/DAT…

…A-2984 to develop

* commit '644ed83a2890082435c35bb1193eacbe966ae043':
  DATA-2984: Split flower dependency from celery to avoid version conflicts with forked celery

setup.py

@@ -116,7 +116,6 @@ def check_previous():
 ]
 celery = [
     'celery==4.0.2-up1.0.0',
-    'flower>=0.7.3'
 ]
 cgroups = [
     'cgroupspy>=0.1.4',
@@ -132,6 +131,9 @@ def check_previous():
 docker = ['docker-py>=1.6.0']
 druid = ['pydruid>=0.2.1']
 emr = ['boto3>=1.0.0']
+flower = [
+    'flower>=0.7.3'
+]
 gcp_api = [
     'httplib2',
     'google-api-python-client>=1.5.0, <1.6.0',
@@ -251,6 +253,7 @@ def do_setup():
             'devel': devel_minreq,
             'devel_hadoop': devel_hadoop,
             'doc': doc,
+            'flower': flower,
             # 'docker': docker,
             # 'druid': druid,
             # 'emr': emr,

upsight/CHANGELOG.md

@@ -5,6 +5,7 @@
 ## 1.8.1-up1.5.0
 
 * Pulled in apache-airflow-1.8.1
+* Split flower dependency from celery to avoid version conflicts with forked celery [DATA-2984](https://kontagent.jira.com/browse/DATA-2984)
 
 ## 1.8.0-up1.4.0