You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2018/08/31 03:01:30 UTC
[GitHub] feng-tao closed pull request #3821: [AIRFLOW-2983] Add
prev_ds_nodash and next_ds_nodash macro
feng-tao closed pull request #3821: [AIRFLOW-2983] Add prev_ds_nodash and next_ds_nodash macro
URL: https://github.com/apache/incubator-airflow/pull/3821
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/airflow/models.py b/airflow/models.py
index 55badf4828..93368e1f18 100755
--- a/airflow/models.py
+++ b/airflow/models.py
@@ -1815,12 +1815,16 @@ def get_template_context(self, session=None):
next_execution_date = task.dag.following_schedule(self.execution_date)
next_ds = None
+ next_ds_nodash = None
if next_execution_date:
next_ds = next_execution_date.strftime('%Y-%m-%d')
+ next_ds_nodash = next_ds.replace('-', '')
prev_ds = None
+ prev_ds_nodash = None
if prev_execution_date:
prev_ds = prev_execution_date.strftime('%Y-%m-%d')
+ prev_ds_nodash = prev_ds.replace('-', '')
ds_nodash = ds.replace('-', '')
ts_nodash = ts.replace('-', '').replace(':', '')
@@ -1887,7 +1891,9 @@ def __repr__(self):
'dag': task.dag,
'ds': ds,
'next_ds': next_ds,
+ 'next_ds_nodash': next_ds_nodash,
'prev_ds': prev_ds,
+ 'prev_ds_nodash': prev_ds_nodash,
'ds_nodash': ds_nodash,
'ts': ts,
'ts_nodash': ts_nodash,
diff --git a/docs/code.rst b/docs/code.rst
index 80ec76193f..c9e9b3d431 100644
--- a/docs/code.rst
+++ b/docs/code.rst
@@ -242,12 +242,14 @@ Variable Description
================================= ====================================
``{{ ds }}`` the execution date as ``YYYY-MM-DD``
``{{ ds_nodash }}`` the execution date as ``YYYYMMDD``
-``{{ prev_ds }}`` the previous execution date as ``YYYY-MM-DD``.
+``{{ prev_ds }}`` the previous execution date as ``YYYY-MM-DD``
if ``{{ ds }}`` is ``2016-01-08`` and ``schedule_interval`` is ``@weekly``,
- ``{{ prev_ds }}`` will be ``2016-01-01``.
-``{{ next_ds }}`` the next execution date as ``YYYY-MM-DD``.
+ ``{{ prev_ds }}`` will be ``2016-01-01``
+``{{ prev_ds_nodash }}`` the previous execution date as ``YYYYMMDD`` if exists, else ``None`
+``{{ next_ds }}`` the next execution date as ``YYYY-MM-DD``
if ``{{ ds }}`` is ``2016-01-01`` and ``schedule_interval`` is ``@weekly``,
- ``{{ prev_ds }}`` will be ``2016-01-08``.
+ ``{{ prev_ds }}`` will be ``2016-01-08``
+``{{ next_ds_nodash }}`` the next execution date as ``YYYYMMDD`` if exists, else ``None`
``{{ yesterday_ds }}`` yesterday's date as ``YYYY-MM-DD``
``{{ yesterday_ds_nodash }}`` yesterday's date as ``YYYYMMDD``
``{{ tomorrow_ds }}`` tomorrow's date as ``YYYY-MM-DD``
diff --git a/tests/core.py b/tests/core.py
index 8df6312eeb..f8b8691912 100644
--- a/tests/core.py
+++ b/tests/core.py
@@ -626,6 +626,35 @@ def __bool__(self):
dag=self.dag)
t.resolve_template_files()
+ def test_task_get_template(self):
+ TI = models.TaskInstance
+ ti = TI(
+ task=self.runme_0, execution_date=DEFAULT_DATE)
+ ti.dag = self.dag_bash
+ ti.run(ignore_ti_state=True)
+ context = ti.get_template_context()
+
+ # DEFAULT DATE is 2015-01-01
+ self.assertEquals(context['ds'], '2015-01-01')
+ self.assertEquals(context['ds_nodash'], '20150101')
+
+ # next_ds is 2015-01-02 as the dag interval is daily
+ self.assertEquals(context['next_ds'], '2015-01-02')
+ self.assertEquals(context['next_ds_nodash'], '20150102')
+
+ # prev_ds is 2014-12-31 as the dag interval is daily
+ self.assertEquals(context['prev_ds'], '2014-12-31')
+ self.assertEquals(context['prev_ds_nodash'], '20141231')
+
+ self.assertEquals(context['ts'], '2015-01-01T00:00:00+00:00')
+ self.assertEquals(context['ts_nodash'], '20150101T000000+0000')
+
+ self.assertEquals(context['yesterday_ds'], '2014-12-31')
+ self.assertEquals(context['yesterday_ds_nodash'], '20141231')
+
+ self.assertEquals(context['tomorrow_ds'], '2015-01-02')
+ self.assertEquals(context['tomorrow_ds_nodash'], '20150102')
+
def test_import_examples(self):
self.assertEqual(len(self.dagbag.dags), NUM_EXAMPLE_DAGS)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services