You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by cr...@apache.org on 2016/05/26 15:23:35 UTC
[1/2] incubator-airflow git commit: [AIRFLOW-178] Fix bug so that zip
file is detected in DAG folder
Repository: incubator-airflow
Updated Branches:
refs/heads/master 387f08cd0 -> 01b3291cc
[AIRFLOW-178] Fix bug so that zip file is detected in DAG folder
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/50f911cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/50f911cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/50f911cd
Branch: refs/heads/master
Commit: 50f911cd39e9fd9abf3a1d3283cf2e6307ab2540
Parents: 456dada
Author: Joy Gao <jo...@wepay.com>
Authored: Wed May 25 21:10:14 2016 -0700
Committer: Joy Gao <jo...@wepay.com>
Committed: Wed May 25 22:18:35 2016 -0700
----------------------------------------------------------------------
airflow/models.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/50f911cd/airflow/models.py
----------------------------------------------------------------------
diff --git a/airflow/models.py b/airflow/models.py
index 67958f2..b23e1ea 100644
--- a/airflow/models.py
+++ b/airflow/models.py
@@ -406,7 +406,7 @@ class DagBag(LoggingMixin):
continue
mod_name, file_ext = os.path.splitext(
os.path.split(filepath)[-1])
- if file_ext != '.py':
+ if file_ext != '.py' and not zipfile.is_zipfile(filepath):
continue
if not any(
[re.findall(p, filepath) for p in patterns]):
[2/2] incubator-airflow git commit: Merge pull request #1545 from
jgao54/zip-bug-fix
Posted by cr...@apache.org.
Merge pull request #1545 from jgao54/zip-bug-fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/01b3291c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/01b3291c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/01b3291c
Branch: refs/heads/master
Commit: 01b3291ccebce7ee032a56845b12da28bde98582
Parents: 387f08c 50f911c
Author: Chris Riccomini <ch...@wepay.com>
Authored: Thu May 26 08:23:25 2016 -0700
Committer: Chris Riccomini <ch...@wepay.com>
Committed: Thu May 26 08:23:25 2016 -0700
----------------------------------------------------------------------
airflow/models.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------