Skip to content

[AIRFLOW-5000] Remove duplicate end_date and reorder template #5618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
BasPH merged 1 commit into from
Jul 22, 2019
Merged

[AIRFLOW-5000] Remove duplicate end_date and reorder template #5618

BasPH merged 1 commit into from
Jul 22, 2019

Conversation

@zhongjiajie
Copy link
Member

@zhongjiajie zhongjiajie commented Jul 20, 2019

  • Remove the duplicate end_date in template context
  • Reorder template context key to make ds together

Make sure you have checked all steps below.

Jira

Description

  • Here are some details about my PR, including screenshots of any UI changes:
  • Remove the duplicate end_date in template context
  • Reorder template context key to make ds together

Code Quality

  • Passes flake8

@zhongjiajie
Copy link
Member Author

zhongjiajie commented Jul 20, 2019 •
edited
Loading

I'm not sure we need END_DATE in template context or not, but I can not find it in our code base and we already have end_date(lowercase) with the same values

@zhongjiajie zhongjiajie force-pushed the model_ti_rm_duplicate_end_date branch from 2520505 to c5cf73f Compare July 20, 2019 11:51
@BasPH
Copy link
Contributor

BasPH commented Jul 20, 2019 •
edited
Loading

I'm all in for this change, but FYI I suggested to do the same + more variables a while ago which led to a discussion going around in circles: #5010 (mailing list thread: https://lists.apache.org/thread.html/a81b32efc95db41a5bf847ed03b64ae4d3e9c8a2cbeda1bdcf0eb2f5@%3Cdev.airflow.apache.org%3E).

I suggest to merge this PR and tackle the other variables one-by-one instead of one single PR.

@zhongjiajie
Copy link
Member Author

zhongjiajie commented Jul 20, 2019

@BasPH Sorry, I don't read all dev mail list and don't know you submit related PR.

But I find out we still have strong opinions on which variable should be remove. But think it safe to remove the duplicate key end_date and END_DATE

I find out that some summary in mail list

We start by putting deprecation warnings on tables, latest_date, end_date and END_DATE and remove them in Airflow 2.0.

I think we still have end_date in template, so @deprecation is not necessary for this PR

zhongjiajie
zhongjiajie commented Jul 20, 2019
View reviewed changes
airflow/models/taskinstance.py Outdated
Copy link
Member Author

@zhongjiajie zhongjiajie Jul 20, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And what do you think this change. At first I think template messy and all date variable should keep together, but I find out your PR like to keep them in alphabetical
Should I change them in alphabetical or keep them? @BasPH

Copy link
Contributor

@BasPH BasPH Jul 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's reorder alphabetically and then merge 👍

@zhongjiajie
[AIRFLOW-5000] Remove duplicate end_date and reorder template
c14a52e 
* Remove the duplicate end_date in template context
* Reorder template context key to make ds together
@zhongjiajie zhongjiajie force-pushed the model_ti_rm_duplicate_end_date branch from c5cf73f to c14a52e Compare July 21, 2019 16:37
@zhongjiajie
Copy link
Member Author

zhongjiajie commented Jul 21, 2019

Reorder template context alphabetically

BasPH
BasPH approved these changes Jul 22, 2019
View reviewed changes
Copy link
Contributor

@BasPH BasPH left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work!

@BasPH BasPH merged commit a2ec24a into apache:master Jul 22, 2019
@zhongjiajie
Copy link
Member Author

zhongjiajie commented Jul 23, 2019

Thanks

@zhongjiajie zhongjiajie deleted the model_ti_rm_duplicate_end_date branch July 23, 2019 01:28
serkef pushed a commit to serkef/airflow that referenced this pull request Jul 24, 2019
@zhongjiajie @serkef
[AIRFLOW-5000] Remove duplicate end_date and reorder template (apache…
550920d 
…#5618)

* Remove the duplicate end_date in template context
* Reorder template context key to make ds together
wmorris75 pushed a commit to modmed-external/incubator-airflow that referenced this pull request Jul 29, 2019
@zhongjiajie
[AIRFLOW-5000] Remove duplicate end_date and reorder template (apache…
3166a90 
…#5618)

* Remove the duplicate end_date in template context
* Reorder template context key to make ds together
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BasPH BasPH BasPH approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@zhongjiajie @BasPH