incubator-airflow git commit: [AIRFLOW-1716] Fix multiple __init__ def in SimpleDag

[bo...@apache.org]

Repository: incubator-airflow
Updated Branches:
  refs/heads/master a13618dd8 -> e05254f87


[AIRFLOW-1716] Fix multiple __init__ def in SimpleDag

Closes #2692 from MortalViews/master


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/e05254f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/e05254f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/e05254f8

Branch: refs/heads/master
Commit: e05254f8731ac55e169cdc581a38b0d3fe06267d
Parents: a13618d
Author: Sanjay P <sa...@gmail.com>
Authored: Sun Oct 22 19:37:27 2017 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Sun Oct 22 19:37:27 2017 +0200

----------------------------------------------------------------------
 airflow/utils/dag_processing.py | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/e05254f8/airflow/utils/dag_processing.py
----------------------------------------------------------------------
diff --git a/airflow/utils/dag_processing.py b/airflow/utils/dag_processing.py
index b80f701..c3b8a95 100644
--- a/airflow/utils/dag_processing.py
+++ b/airflow/utils/dag_processing.py
@@ -36,40 +36,13 @@ class SimpleDag(BaseDag):
     required for instantiating and scheduling its associated tasks.
     """
 
-    def __init__(self,
-                 dag_id,
-                 task_ids,
-                 full_filepath,
-                 concurrency,
-                 is_paused,
-                 pickle_id,
-                 task_special_args):
-        """
-        :param dag_id: ID of the DAG
-        :type dag_id: unicode
-        :param task_ids: task IDs associated with the DAG
-        :type task_ids: list[unicode]
-        :param full_filepath: path to the file containing the DAG e.g.
-        /a/b/c.py
-        :type full_filepath: unicode
-        :param concurrency: No more than these many tasks from the
-        dag should run concurrently
-        :type concurrency: int
-        :param is_paused: Whether or not this DAG is paused. Tasks from paused
-        DAGs are not scheduled
-        :type is_paused: bool
+    def __init__(self, dag, pickle_id=None):
+        """
+        :param dag: the DAG object
+        :type dag: models.DAG
         :param pickle_id: ID associated with the pickled version of this DAG.
         :type pickle_id: unicode
         """
-        self._dag_id = dag_id
-        self._task_ids = task_ids
-        self._full_filepath = full_filepath
-        self._is_paused = is_paused
-        self._concurrency = concurrency
-        self._pickle_id = pickle_id
-        self._task_special_args = task_special_args
-
-    def __init__(self, dag, pickle_id=None):
         self._dag_id = dag.dag_id
         self._task_ids = [task.task_id for task in dag.tasks]
         self._full_filepath = dag.full_filepath