Skip to content
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.

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

[AIRFLOW-520] Fix Version Info in Flask UI #4072

Merged
merged 1 commit into from
Oct 23, 2018
Merged

Conversation

kaxil
Copy link
Member

@kaxil kaxil commented Oct 20, 2018

Make sure you have checked all steps below.

Jira

Description

  • Here are some details about my PR, including screenshots of any UI changes:
    image

That is because of the following issue:

>>> import pkg_resources
>>> airflow_version = pkg_resources.require("apache-airflow")[0].version
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/Users/kaxil/.virtualenvs/airflow_stable_pip/lib/python2.7/site-packages/pkg_resources/__init__.py", line 892, in require
    needed = self.resolve(parse_requirements(requirements))
  File "/Users/kaxil/.virtualenvs/airflow_stable_pip/lib/python2.7/site-packages/pkg_resources/__init__.py", line 783, in resolve
    raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (Flask-Login 0.2.11 (/Users/kaxil/.virtualenvs/airflow_stable_pip/lib/python2.7/site-packages), Requirement.parse('Flask-Login<0.5,>=0.3'), set(['flask-appbuilder']))

This also brings it in line with RBAC FAB UI.

Tests

  • My PR adds the following unit tests OR does not need testing for this extremely good reason:

Commits

  • My commits all reference Jira issues in their subject lines, and I have squashed multiple commits if they address the same issue. In addition, my commits follow the guidelines from "How to write a good git commit message":
    1. Subject is separated from body by a blank line
    2. Subject is limited to 50 characters (not including Jira issue reference)
    3. Subject does not end with a period
    4. Subject uses the imperative mood ("add", not "adding")
    5. Body wraps at 72 characters
    6. Body explains "what" and "why", not "how"

Documentation

  • In case of new functionality, my PR adds documentation that describes how to use it.
    • When adding new operators/hooks/sensors, the autoclass documentation generation needs to be added.

Code Quality

  • Passes flake8

@kaxil kaxil requested review from ashb and Fokko October 20, 2018 22:30
@kaxil
Copy link
Member Author

kaxil commented Oct 21, 2018

@ashb Can we include this in 1.10, please ??? 😉

@codecov-io
Copy link

Codecov Report

Merging #4072 into master will decrease coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4072      +/-   ##
==========================================
- Coverage   77.69%   77.68%   -0.01%     
==========================================
  Files         199      199              
  Lines       15957    15956       -1     
==========================================
- Hits        12397    12396       -1     
  Misses       3560     3560
Impacted Files Coverage Δ
airflow/www/views.py 68.89% <0%> (-0.02%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b156151...4b17842. Read the comment docs.

Copy link
Member

@ashb ashb left a comment

Choose a reason for hiding this comment

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

Do we need the try/except anymore?

@kaxil kaxil merged commit 7df4405 into apache:master Oct 23, 2018
omusavi pushed a commit to cse-airflow/incubator-airflow that referenced this pull request Oct 25, 2018
tekn0ir pushed a commit to tekn0ir/incubator-airflow that referenced this pull request Oct 26, 2018
* master:
  [AIRFLOW-520] Fix Version Info in Flask UI (apache#4072)
  [AIRFLOW-XXX] Add Neoway to companies list (apache#4081)
  [AIRFLOW-XXX] Add Surfline to companies list (apache#4079)
  Revert "[AIRFLOW-461] Restore parameter position for BQ run_load method (apache#4077)"
  [AIRFLOW-461] Restore parameter position for BQ run_load method (apache#4077)
  [AIRFLOW-461]  Support autodetected schemas in BigQuery run_load (apache#3880)
  [AIRFLOW-3238] Fix models.DAG to deactivate unknown DAGs on initdb (apache#4073)
  [AIRFLOW-3239] Fix test recovery further (apache#4074)
  [AIRFLOW-3203] Fix DockerOperator & some operator test (apache#4049)
  [AIRFLOW-1867] Add sandbox mode and py3k bug  (apache#2824)
  [AIRFLOW-2993] s3_to_sftp and sftp_to_s3 operators (apache#3828)
  [AIRFLOW-XXX] BigQuery Hook - Minor Refactoring (apache#4066)
  [AIRFLOW-3232] More readable GCF operator documentation (apache#4067)
galak75 pushed a commit to VilledeMontreal/incubator-airflow that referenced this pull request Nov 23, 2018
aliceabe pushed a commit to aliceabe/incubator-airflow that referenced this pull request Jan 3, 2019
@kaxil kaxil deleted the ui-version branch January 8, 2019 23:18
cfei18 pushed a commit to cfei18/incubator-airflow that referenced this pull request Jan 23, 2019
wmorris75 pushed a commit to modmed/incubator-airflow that referenced this pull request Jul 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants