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/01/22 16:38:52 UTC
[1/7] incubator-airflow git commit: [AIRFLOW-624] Fix setup.py to not
import airflow.version as version
Repository: incubator-airflow
Updated Branches:
refs/heads/v1-8-test ecbe3ce6c -> 1ea4c533f
[AIRFLOW-624] Fix setup.py to not import airflow.version as version
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/bccb9e2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/bccb9e2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/bccb9e2c
Branch: refs/heads/v1-8-test
Commit: bccb9e2cb9ac37036c86b0d0be4990b0942c1010
Parents: 927f30c
Author: George Sakkis <ge...@gmail.com>
Authored: Sat Jan 21 13:45:08 2017 +0200
Committer: George Sakkis <ge...@gmail.com>
Committed: Sat Jan 21 15:07:37 2017 +0200
----------------------------------------------------------------------
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/bccb9e2c/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index b8fe677..917a967 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ logger = logging.getLogger(__name__)
# Kept manually in sync with airflow.__version__
version = imp.load_source(
- 'version', os.path.join('airflow', 'version.py')).version
+ 'airflow.version', os.path.join('airflow', 'version.py')).version
class Tox(TestCommand):
[3/7] incubator-airflow git commit: [AIRFLOW-785] Don't import
CgroupTaskRunner at global scope
Posted by bo...@apache.org.
[AIRFLOW-785] Don't import CgroupTaskRunner at global scope
cgroups is not a required 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/1a801cc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/1a801cc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/1a801cc3
Branch: refs/heads/v1-8-test
Commit: 1a801cc3b4e5263278a780df59f30f72c21597dc
Parents: cce6ffc
Author: George Sakkis <ge...@gmail.com>
Authored: Sat Jan 21 14:48:06 2017 +0200
Committer: George Sakkis <ge...@gmail.com>
Committed: Sun Jan 22 14:55:37 2017 +0200
----------------------------------------------------------------------
airflow/task_runner/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/1a801cc3/airflow/task_runner/__init__.py
----------------------------------------------------------------------
diff --git a/airflow/task_runner/__init__.py b/airflow/task_runner/__init__.py
index f134e8e..e0527cb 100644
--- a/airflow/task_runner/__init__.py
+++ b/airflow/task_runner/__init__.py
@@ -13,7 +13,6 @@
# limitations under the License.
from airflow import configuration
-from airflow.contrib.task_runner.cgroup_task_runner import CgroupTaskRunner
from airflow.task_runner.bash_task_runner import BashTaskRunner
from airflow.exceptions import AirflowException
@@ -33,6 +32,7 @@ def get_task_runner(local_task_job):
if _TASK_RUNNER == "BashTaskRunner":
return BashTaskRunner(local_task_job)
elif _TASK_RUNNER == "CgroupTaskRunner":
+ from airflow.contrib.task_runner.cgroup_task_runner import CgroupTaskRunner
return CgroupTaskRunner(local_task_job)
else:
raise AirflowException("Unknown task runner type {}".format(_TASK_RUNNER))
[7/7] incubator-airflow git commit: Merge branch 'master' into
v1-8-test
Posted by bo...@apache.org.
Merge branch 'master' into v1-8-test
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/1ea4c533
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/1ea4c533
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/1ea4c533
Branch: refs/heads/v1-8-test
Commit: 1ea4c533f7ba56709ecf89812759e4b84c049382
Parents: ecbe3ce a2b0ea3
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Sun Jan 22 17:38:27 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Sun Jan 22 17:38:27 2017 +0100
----------------------------------------------------------------------
airflow/jobs.py | 8 +-------
airflow/task_runner/__init__.py | 2 +-
setup.py | 6 +++---
3 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[5/7] incubator-airflow git commit: [AIRFLOW-776] Add missing cgroups
devel dependency
Posted by bo...@apache.org.
[AIRFLOW-776] Add missing cgroups devel dependency
Closes #2009 from aminghadersohi/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/2acb10a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/2acb10a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/2acb10a8
Branch: refs/heads/v1-8-test
Commit: 2acb10a814df3231297a2ffcde0bd2c3072423dc
Parents: 927f30c
Author: Amin Ghadersohi <mr...@uber.com>
Authored: Sun Jan 22 16:56:54 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Sun Jan 22 16:57:02 2017 +0100
----------------------------------------------------------------------
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/2acb10a8/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index b8fe677..e09d568 100644
--- a/setup.py
+++ b/setup.py
@@ -178,7 +178,7 @@ devel = [
'nose-ignore-docstring==0.2',
'nose-parameterized',
]
-devel_minreq = devel + mysql + doc + password + s3
+devel_minreq = devel + mysql + doc + password + s3 + cgroups
devel_hadoop = devel_minreq + hive + hdfs + webhdfs + kerberos
devel_all = devel + all_dbs + doc + samba + s3 + slack + crypto + oracle + docker
[6/7] incubator-airflow git commit: Merge pull request #2010 from
gsakkis/fixes
Posted by bo...@apache.org.
Merge pull request #2010 from gsakkis/fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/a2b0ea32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/a2b0ea32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/a2b0ea32
Branch: refs/heads/v1-8-test
Commit: a2b0ea322694409a43f05275ded8acb47b809e98
Parents: 2acb10a 2d2d627
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Sun Jan 22 17:36:04 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Sun Jan 22 17:36:04 2017 +0100
----------------------------------------------------------------------
airflow/jobs.py | 8 +-------
airflow/task_runner/__init__.py | 2 +-
setup.py | 4 ++--
3 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/a2b0ea32/setup.py
----------------------------------------------------------------------
[4/7] incubator-airflow git commit: [AIRFLOW-777] Fix expression to
check if a DagRun is in running state
Posted by bo...@apache.org.
[AIRFLOW-777] Fix expression to check if a DagRun is in running state
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/2d2d6270
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/2d2d6270
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/2d2d6270
Branch: refs/heads/v1-8-test
Commit: 2d2d6270ad6bf6052c3efe90100740d3470c0cd1
Parents: 1a801cc
Author: George Sakkis <ge...@gmail.com>
Authored: Sat Jan 21 15:06:43 2017 +0200
Committer: George Sakkis <ge...@gmail.com>
Committed: Sun Jan 22 14:55:48 2017 +0200
----------------------------------------------------------------------
airflow/jobs.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/2d2d6270/airflow/jobs.py
----------------------------------------------------------------------
diff --git a/airflow/jobs.py b/airflow/jobs.py
index f1de333..8bb93bb 100644
--- a/airflow/jobs.py
+++ b/airflow/jobs.py
@@ -919,13 +919,7 @@ class SchedulerJob(BaseJob):
task_instance.execution_date,
dag_runs))
- dag_is_running = True
- for dag_run in dag_runs:
- if dag_run.state == State.RUNNING:
- dag_is_running = True
- break
-
- if not dag_is_running:
+ if not any(dag_run.state == State.RUNNING for dag_run in dag_runs):
self.logger.warn("Setting {} to state={} as it does not have "
"a DagRun in the {} state"
.format(task_instance,
[2/7] incubator-airflow git commit: [AIRFLOW-784] Pin funcsigs to
1.0.0
Posted by bo...@apache.org.
[AIRFLOW-784] Pin funcsigs to 1.0.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/cce6ffcf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/cce6ffcf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/cce6ffcf
Branch: refs/heads/v1-8-test
Commit: cce6ffcf079e1385de3611329f2817ba6f34fa66
Parents: bccb9e2
Author: George Sakkis <ge...@gmail.com>
Authored: Sat Jan 21 14:37:25 2017 +0200
Committer: George Sakkis <ge...@gmail.com>
Committed: Sat Jan 21 15:07:58 2017 +0200
----------------------------------------------------------------------
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/cce6ffcf/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 917a967..0386723 100644
--- a/setup.py
+++ b/setup.py
@@ -205,7 +205,7 @@ def do_setup():
'flask-login==0.2.11',
'flask-swagger==0.2.13',
'flask-wtf==0.12',
- 'funcsigs>=1.0.2, <1.1',
+ 'funcsigs==1.0.0',
'future>=0.15.0, <0.16',
'gitpython>=2.0.2',
'gunicorn>=19.3.0, <19.4.0', # 19.4.? seemed to have issues