Repository: incubator-airflow Updated Branches: refs/heads/master ae51daf89 -> f6e9f1bed
[AIRFLOW-2444] Remove unused option(include_adhoc) in cli backfill command Closes #3337 from feng-tao/remove-unused-flag Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/f6e9f1be Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/f6e9f1be Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/f6e9f1be Branch: refs/heads/master Commit: f6e9f1bed0e59889e6700e13ebc981996b1c9514 Parents: ae51daf Author: Tao feng <[email protected]> Authored: Thu May 10 10:13:43 2018 +0200 Committer: Bolke de Bruin <[email protected]> Committed: Thu May 10 10:13:43 2018 +0200 ---------------------------------------------------------------------- airflow/bin/cli.py | 6 +----- airflow/jobs.py | 2 -- airflow/models.py | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f6e9f1be/airflow/bin/cli.py ---------------------------------------------------------------------- diff --git a/airflow/bin/cli.py b/airflow/bin/cli.py index 3097dce..dc88104 100644 --- a/airflow/bin/cli.py +++ b/airflow/bin/cli.py @@ -191,7 +191,6 @@ def backfill(args, dag=None): start_date=args.start_date, end_date=args.end_date, mark_success=args.mark_success, - include_adhoc=args.include_adhoc, local=args.local, donot_pickle=(args.donot_pickle or conf.getboolean('core', 'donot_pickle')), @@ -1297,9 +1296,6 @@ class CLIFactory(object): "to the workers, just tell the workers to run their version " "of the code."), "store_true"), - 'include_adhoc': Arg( - ("-a", "--include_adhoc"), - "Include dags with the adhoc parameter.", "store_true"), 'bf_ignore_dependencies': Arg( ("-i", "--ignore_dependencies"), ( @@ -1640,7 +1636,7 @@ class CLIFactory(object): 'help': "Run subsections of a DAG for a specified date range", 'args': ( 'dag_id', 'task_regex', 'start_date', 'end_date', - 'mark_success', 'local', 'donot_pickle', 'include_adhoc', + 'mark_success', 'local', 'donot_pickle', 'bf_ignore_dependencies', 'bf_ignore_first_depends_on_past', 'subdir', 'pool', 'delay_on_limit', 'dry_run') }, { http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f6e9f1be/airflow/jobs.py ---------------------------------------------------------------------- diff --git a/airflow/jobs.py b/airflow/jobs.py index e5a07b7..045b4b7 100644 --- a/airflow/jobs.py +++ b/airflow/jobs.py @@ -1942,7 +1942,6 @@ class BackfillJob(BaseJob): start_date=None, end_date=None, mark_success=False, - include_adhoc=False, donot_pickle=False, ignore_first_depends_on_past=False, ignore_task_deps=False, @@ -1954,7 +1953,6 @@ class BackfillJob(BaseJob): self.bf_start_date = start_date self.bf_end_date = end_date self.mark_success = mark_success - self.include_adhoc = include_adhoc self.donot_pickle = donot_pickle self.ignore_first_depends_on_past = ignore_first_depends_on_past self.ignore_task_deps = ignore_task_deps http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f6e9f1be/airflow/models.py ---------------------------------------------------------------------- diff --git a/airflow/models.py b/airflow/models.py index c8a737c..536cf6d 100755 --- a/airflow/models.py +++ b/airflow/models.py @@ -3910,7 +3910,6 @@ class DAG(BaseDag, LoggingMixin): start_date=None, end_date=None, mark_success=False, - include_adhoc=False, local=False, executor=None, donot_pickle=configuration.conf.getboolean('core', 'donot_pickle'), @@ -3927,8 +3926,6 @@ class DAG(BaseDag, LoggingMixin): :type end_date: datetime :param mark_success: True to mark jobs as succeeded without running them :type mark_success: bool - :param include_adhoc: True to include dags with the adhoc parameter - :type include_adhoc: bool :param local: True to run the tasks using the LocalExecutor :type local: bool :param executor: The executor instance to run the tasks @@ -3956,7 +3953,6 @@ class DAG(BaseDag, LoggingMixin): start_date=start_date, end_date=end_date, mark_success=mark_success, - include_adhoc=include_adhoc, executor=executor, donot_pickle=donot_pickle, ignore_task_deps=ignore_task_deps,
