airflow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] kaxil closed pull request #4072: [AIRFLOW-520] Fix Version Info in Flask UI
Date Tue, 23 Oct 2018 09:24:20 GMT
kaxil closed pull request #4072: [AIRFLOW-520] Fix Version Info in Flask UI
URL: https://github.com/apache/incubator-airflow/pull/4072
 
 
   

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/www/views.py b/airflow/www/views.py
index f786baa0fe..e3a66a3840 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -37,7 +37,6 @@
 import markdown
 import nvd3
 import pendulum
-import pkg_resources
 import sqlalchemy as sqla
 from flask import (
     abort, jsonify, redirect, url_for, request, Markup, Response,
@@ -3052,7 +3051,7 @@ class VersionView(wwwutils.SuperUserMixin, BaseView):
     def version(self):
         # Look at the version from setup.py
         try:
-            airflow_version = pkg_resources.require("apache-airflow")[0].version
+            airflow_version = airflow.__version__
         except Exception as e:
             airflow_version = None
             logging.error(e)


 

----------------------------------------------------------------
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

Mime
View raw message