Put deps at end of setup.py to reduce merge conflicts - see apache#3302

kimetrica · Dec 15, 2017 · ebeda44 · ebeda44
1 parent 4f15e07
commit ebeda44
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/setup.py b/setup.py
@@ -44,13 +44,10 @@ def get_git_sha():
     zip_safe=False,
     scripts=['superset/bin/superset'],
     install_requires=[
-        'beautifulsoup4==4.6.0',
         'boto3>=1.4.6',
-        'bottleneck==1.2.1',
         'celery==4.1.0',
         'colorama==0.3.9',
         'cryptography==1.9',
-        'feather-format==0.4.0',
         'flask==0.12.2',
         'flask-appbuilder==1.9.4',
         'flask-cache==0.13.1',
@@ -61,13 +58,10 @@ def get_git_sha():
         'flask-wtf==0.14.2',
         'flower==0.9.1',
         'future>=0.16.0, <0.17',
-        'html5lib==0.999999999',
         'humanize==0.5.1',
         'gunicorn==19.7.1',
         'idna==2.5',
-        'lxml==3.8.0',
         'markdown==2.6.8',
-        'numexpr==2.6.4',
         'pandas==0.20.3',
         'parsedatetime==2.0.0',
         'pydruid==0.3.1',
@@ -81,6 +75,12 @@ def get_git_sha():
         'sqlparse==0.2.3',
         'thrift>=0.9.3',
         'thrift-sasl>=0.2.1',
+        'beautifulsoup4==4.6.0',
+        'bottleneck==1.2.1',
+        'feather-format==0.4.0',
+        'html5lib==0.999999999',
+        'lxml==3.8.0',
+        'numexpr==2.6.4',
         'xlrd==1.1.0',
     ],
     extras_require={