From f7f2a8cdd87cbb54a4feeca0e379e954917dafbf Mon Sep 17 00:00:00 2001
From: Stefanie Grunwald <stefanie.grunwald@adobe.com>
Date: Sun, 8 Oct 2017 19:30:07 +0200
Subject: [PATCH] [AIRFLOW-1669] Fix Docker and pin Moto to 1.1.19

https://github.com/spulec/moto/pull/1048 introduced `docker` as a
dependency in Moto, causing a conflict as Airflow uses `docker-py`. As
both packages don't work together, Moto is pinned to the version
prior to that change.

(cherry picked from commit a61d9444cdb2780f70187459c072c962d0fd6660)
Signed-off-by: Bolke de Bruin <bolke@xs4all.nl>
---
 scripts/ci/requirements.txt | 2 +-
 setup.py                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/requirements.txt b/scripts/ci/requirements.txt
index d612d6f2f9ba5..f70edb186b35a 100644
--- a/scripts/ci/requirements.txt
+++ b/scripts/ci/requirements.txt
@@ -53,7 +53,7 @@ ldap3
 lxml
 markdown
 mock
-moto
+moto==1.1.19
 mysqlclient
 nose
 nose-exclude
diff --git a/setup.py b/setup.py
index 2d765662efd56..2a87c4f933116 100644
--- a/setup.py
+++ b/setup.py
@@ -181,7 +181,7 @@ def write_version(filename=os.path.join(*['airflow',
     'jira',
     'lxml>=3.3.4',
     'mock',
-    'moto',
+    'moto==1.1.19',
     'nose',
     'nose-ignore-docstring==0.2',
     'nose-timer',