[AIRFLOW-1669] Fix Docker and pin Moto to 1.1.19

getmoto/moto#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 a61d944) Signed-off-by: Bolke de Bruin <[email protected]>
soundcloud · Nov 2, 2017 · f7f2a8c · f7f2a8c
1 parent d4406c0
commit f7f2a8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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',