Repository: incubator-airflow Updated Branches: refs/heads/v1-8-test afdcacc4b -> cc022fb2b
[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 (cherry picked from commit 938da987c25c2a404c9fd8d624b2d203e0da3b30) Signed-off-by: Bolke de Bruin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/cc022fb2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/cc022fb2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/cc022fb2 Branch: refs/heads/v1-8-test Commit: cc022fb2b5f67ebb2b98597c747e1747d7b6b253 Parents: afdcacc Author: Fokko Driesprong <[email protected]> Authored: Mon Oct 2 17:02:39 2017 +0200 Committer: Bolke de Bruin <[email protected]> Committed: Mon Oct 2 17:03:21 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/cc022fb2/airflow/operators/docker_operator.py ---------------------------------------------------------------------- diff --git a/airflow/operators/docker_operator.py b/airflow/operators/docker_operator.py index c75e776..e8157d0 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/cc022fb2/tests/operators/docker_operator.py ---------------------------------------------------------------------- diff --git a/tests/operators/docker_operator.py b/tests/operators/docker_operator.py index cdfae94..aab61f4 100644 --- a/tests/operators/docker_operator.py +++ b/tests/operators/docker_operator.py @@ -16,7 +16,7 @@ import unittest try: from airflow.operators.docker_operator import DockerOperator - from docker.client import Client + from docker import APIClient as Client except ImportError: pass
