airflow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject incubator-airflow git commit: [AIRFLOW-1669][AIRFLOW-1368] Fix Docker import
Date Mon, 02 Oct 2017 15:02:44 GMT
Repository: incubator-airflow
Updated Branches:
  refs/heads/master 6895483ee -> 938da987c


[AIRFLOW-1669][AIRFLOW-1368] Fix Docker import

We want to fix the Docker import. At the revert of
AIRFLOW-1368
something went wrong.

Closes #2653 from Fokko/AIRFLOW-1669-fix-docker-
import


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

Branch: refs/heads/master
Commit: 938da987c25c2a404c9fd8d624b2d203e0da3b30
Parents: 6895483
Author: Fokko Driesprong <fokkodriesprong@godatadriven.com>
Authored: Mon Oct 2 17:02:39 2017 +0200
Committer: Bolke de Bruin <bolke@xs4all.nl>
Committed: Mon Oct 2 17:02:39 2017 +0200

----------------------------------------------------------------------
 airflow/operators/docker_operator.py | 2 +-
 tests/operators/docker_operator.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/938da987/airflow/operators/docker_operator.py
----------------------------------------------------------------------
diff --git a/airflow/operators/docker_operator.py b/airflow/operators/docker_operator.py
index 3011f1c..f319cf4 100644
--- a/airflow/operators/docker_operator.py
+++ b/airflow/operators/docker_operator.py
@@ -18,7 +18,7 @@ from airflow.exceptions import AirflowException
 from airflow.models import BaseOperator
 from airflow.utils.decorators import apply_defaults
 from airflow.utils.file import TemporaryDirectory
-from docker import Client, tls
+from docker import APIClient as Client, tls
 import ast
 
 

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/938da987/tests/operators/docker_operator.py
----------------------------------------------------------------------
diff --git a/tests/operators/docker_operator.py b/tests/operators/docker_operator.py
index 264096c..8458580 100644
--- a/tests/operators/docker_operator.py
+++ b/tests/operators/docker_operator.py
@@ -17,7 +17,7 @@ import logging
 
 try:
     from airflow.operators.docker_operator import DockerOperator
-    from docker.client import Client
+    from docker import APIClient as Client
 except ImportError:
     pass
 


Mime
View raw message