Repository: incubator-airflow Updated Branches: refs/heads/master e2c3831a4 -> cf2605d3e
[AIRFLOW-1338] Fix incompatible GCP dataflow hook Closes #2388 from fenglu-g/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/cf2605d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/cf2605d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/cf2605d3 Branch: refs/heads/master Commit: cf2605d3e5e58811d32f8d41771710dcb0041037 Parents: e2c3831 Author: Feng Lu <[email protected]> Authored: Fri Jun 23 13:26:04 2017 -0700 Committer: Chris Riccomini <[email protected]> Committed: Fri Jun 23 13:26:16 2017 -0700 ---------------------------------------------------------------------- airflow/contrib/hooks/gcp_dataflow_hook.py | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/cf2605d3/airflow/contrib/hooks/gcp_dataflow_hook.py ---------------------------------------------------------------------- diff --git a/airflow/contrib/hooks/gcp_dataflow_hook.py b/airflow/contrib/hooks/gcp_dataflow_hook.py index aaa9992..fc73288 100644 --- a/airflow/contrib/hooks/gcp_dataflow_hook.py +++ b/airflow/contrib/hooks/gcp_dataflow_hook.py @@ -152,7 +152,7 @@ class DataFlowHook(GoogleCloudBaseHook): task_id, variables, dataflow, name, ["python"] + py_options) def _build_cmd(self, task_id, variables, dataflow): - command = [dataflow, "--runner=DataflowPipelineRunner"] + command = [dataflow, "--runner=DataflowRunner"] if variables is not None: for attr, value in variables.iteritems(): command.append("--" + attr + "=" + value) http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/cf2605d3/setup.py ---------------------------------------------------------------------- diff --git a/setup.py b/setup.py index 80668da..e4689d2 100644 --- a/setup.py +++ b/setup.py @@ -142,6 +142,7 @@ gcp_api = [ 'google-api-python-client>=1.5.0, <1.6.0', 'oauth2client>=2.0.2, <2.1.0', 'PyOpenSSL', + 'google-cloud-dataflow', 'pandas-gbq' ] hdfs = ['snakebite>=2.7.8']
