You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by sa...@apache.org on 2016/11/21 01:07:02 UTC

incubator-airflow git commit: [AIRFLOW-639]AIRFLOW-639] Alphasort package names

Repository: incubator-airflow
Updated Branches:
  refs/heads/master dcecf54a1 -> ca6dbc648


[AIRFLOW-639]AIRFLOW-639] Alphasort package names

Closes #1895 from zodiac/alphasort_requirements


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/ca6dbc64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/ca6dbc64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/ca6dbc64

Branch: refs/heads/master
Commit: ca6dbc64855b88c6a98e7c33725ebf6438811c66
Parents: dcecf54
Author: Li Xuanji <xu...@gmail.com>
Authored: Sun Nov 20 17:06:47 2016 -0800
Committer: Siddharth Anand <si...@yahoo.com>
Committed: Sun Nov 20 17:06:47 2016 -0800

----------------------------------------------------------------------
 scripts/ci/requirements.txt | 45 ++++++++++++++++++++--------------------
 setup.py                    |  4 ++--
 2 files changed, 24 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/ca6dbc64/scripts/ci/requirements.txt
----------------------------------------------------------------------
diff --git a/scripts/ci/requirements.txt b/scripts/ci/requirements.txt
index 5d7b4bb..1576709 100644
--- a/scripts/ci/requirements.txt
+++ b/scripts/ci/requirements.txt
@@ -1,62 +1,61 @@
 alembic
+bcrypt
 boto
 celery
 chartkick
-cryptography
+cloudant
 coverage
 coveralls
 croniter
+cryptography
 dill
-python-daemon
 docker-py
 filechunkio
 flake8
 flask
 flask-admin
+flask-bcrypt
 flask-cache
 flask-login==0.2.11
+Flask-WTF
 flower
 future
 gunicorn
+hdfs
 hive-thrift-py
+impyla
 ipython
+jaydebeapi
 jinja2
+ldap3
+lxml
 markdown
+mock
+mysqlclient
 nose
-nose-parameterized
 nose-exclude
+nose-parameterized
 pandas
+psutil>=4.2.0, <5.0.0
+psycopg2
+pydruid
 pygments
 pyhive
-pydruid
+pykerberos
 PyOpenSSL
 PySmbClient
-psutil>=4.2.0, <5.0.0
-psycopg2
+python-daemon
 python-dateutil
 redis
 requests
 setproctitle
-statsd
-# snakebite -> not compatible with Python 3
+slackclient
 sphinx
 sphinx-argparse
-sphinx_rtd_theme
 Sphinx-PyPI-upload
+sphinx_rtd_theme
 sqlalchemy
+statsd
 thrift
-jaydebeapi
-mysqlclient
-unicodecsv
-slackclient
-ldap3
-Flask-WTF
-lxml
-pykerberos
-bcrypt
-flask-bcrypt
-mock
-hdfs
 thrift_sasl
-impyla
-cloudant
+unicodecsv

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/ca6dbc64/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 8364d92..a863fe3 100644
--- a/setup.py
+++ b/setup.py
@@ -193,6 +193,7 @@ def do_setup():
             'gitpython>=2.0.2',
             'gunicorn>=19.3.0, <19.4.0',  # 19.4.? seemed to have issues
             'jinja2>=2.7.3, <3.0',
+            'lxml>=3.6.0, <4.0',
             'markdown>=2.5.2, <3.0',
             'pandas>=0.17.1, <1.0.0',
             'psutil>=4.2.0, <5.0.0',
@@ -206,7 +207,6 @@ def do_setup():
             'tabulate>=0.7.5, <0.8.0',
             'thrift>=0.9.2, <0.10',
             'zope.deprecation>=4.0, <5.0',
-	    'lxml>=3.6.0, <4.0',
         ],
         extras_require={
             'all': devel_all,
@@ -221,6 +221,7 @@ def do_setup():
             'doc': doc,
             'docker': docker,
             'druid': druid,
+            'emr': emr,
             'gcp_api': gcp_api,
             'github_enterprise': github_enterprise,
             'hdfs': hdfs,
@@ -236,7 +237,6 @@ def do_setup():
             'qds': qds,
             'rabbitmq': rabbitmq,
             's3': s3,
-            'emr': emr,
             'salesforce': salesforce,
             'samba': samba,
             'slack': slack,