You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bo...@apache.org on 2017/11/02 18:13:50 UTC
[2/2] incubator-airflow git commit: [AIRFLOW-1669] Fix Docker and pin
Moto to 1.1.19
[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 <bo...@xs4all.nl>
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/f7f2a8cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/f7f2a8cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/f7f2a8cd
Branch: refs/heads/v1-9-test
Commit: f7f2a8cdd87cbb54a4feeca0e379e954917dafbf
Parents: d4406c0
Author: Stefanie Grunwald <st...@adobe.com>
Authored: Sun Oct 8 19:30:07 2017 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Thu Nov 2 19:13:40 2017 +0100
----------------------------------------------------------------------
scripts/ci/requirements.txt | 2 +-
setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f7f2a8cd/scripts/ci/requirements.txt
----------------------------------------------------------------------
diff --git a/scripts/ci/requirements.txt b/scripts/ci/requirements.txt
index d612d6f..f70edb1 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
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f7f2a8cd/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 2d76566..2a87c4f 100644
--- a/setup.py
+++ b/setup.py
@@ -181,7 +181,7 @@ devel = [
'jira',
'lxml>=3.3.4',
'mock',
- 'moto',
+ 'moto==1.1.19',
'nose',
'nose-ignore-docstring==0.2',
'nose-timer',