You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bo...@apache.org on 2017/12/29 12:00:47 UTC

[1/2] incubator-airflow git commit: [AIRFLOW-XXX] Pin sqlalchemy dependency

Repository: incubator-airflow
Updated Branches:
  refs/heads/master fdd7f43fe -> f434e2bd9


[AIRFLOW-XXX] Pin sqlalchemy dependency


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

Branch: refs/heads/master
Commit: 5e4d7d8d7da250cacc15d8a2247098f0b42a3def
Parents: 56f4219
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Fri Dec 29 12:28:51 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Fri Dec 29 12:28:51 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/5e4d7d8d/scripts/ci/requirements.txt
----------------------------------------------------------------------
diff --git a/scripts/ci/requirements.txt b/scripts/ci/requirements.txt
index 2b5a8c9..0530a72 100644
--- a/scripts/ci/requirements.txt
+++ b/scripts/ci/requirements.txt
@@ -87,7 +87,7 @@ sphinx
 sphinx-argparse
 Sphinx-PyPI-upload
 sphinx_rtd_theme
-sqlalchemy
+sqlalchemy>=1.1.15, <1.2.0
 statsd
 thrift
 thrift_sasl

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/5e4d7d8d/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 77e79bf..f270dba 100644
--- a/setup.py
+++ b/setup.py
@@ -226,7 +226,7 @@ def do_setup():
             'python-nvd3==0.14.2',
             'requests>=2.5.1, <3',
             'setproctitle>=1.1.8, <2',
-            'sqlalchemy>=0.9.8',
+            'sqlalchemy>=1.1.15, <1.2.0',
             'sqlalchemy-utc>=0.9.0',
             'tabulate>=0.7.5, <0.8.0',
             'thrift>=0.9.2',


[2/2] incubator-airflow git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-airflow

Posted by bo...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-airflow


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

Branch: refs/heads/master
Commit: f434e2bd91ce658f7fab1e9ea37ffb76620e971a
Parents: 5e4d7d8 fdd7f43
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Fri Dec 29 13:00:34 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Fri Dec 29 13:00:34 2017 +0100

----------------------------------------------------------------------
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------