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 2020/12/06 14:31:09 UTC
[GitHub] [airflow] potiuk opened a new pull request #12853: Add conditional version retrieval from setup.
potiuk opened a new pull request #12853:
URL: https://github.com/apache/airflow/pull/12853
When airflow is not installed as package (for example for local
development from sources) there is no package metadata.
Many of our unit tests use the version field and they fail if they
are run within virtual environment where airflow is not installed
as package (for example in IntelliJ this is default setting.
This PR adds fall-back to read airflow version from setup in
case it cannot be read from package metadata.
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
[GitHub] [airflow] potiuk commented on a change in pull request #12853: Add conditional version retrieval from setup.
Posted by GitBox <gi...@apache.org>.
potiuk commented on a change in pull request #12853:
URL: https://github.com/apache/airflow/pull/12853#discussion_r537062313
##########
File path: airflow/version.py
##########
@@ -24,6 +24,13 @@
except ImportError:
import importlib_metadata as metadata
-version = metadata.version('apache-airflow')
+try:
+ version = metadata.version('apache-airflow')
+except metadata.PackageNotFoundError:
+ import logging
+
+ log = logging.getLogger(__name__)
+ log.warning("Package metadata could not be found. Overriding it with version found in setup.py")
+ from setup import version
Review comment:
Better safe than sorry.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
[GitHub] [airflow] potiuk merged pull request #12853: Add conditional version retrieval from setup.
Posted by GitBox <gi...@apache.org>.
potiuk merged pull request #12853:
URL: https://github.com/apache/airflow/pull/12853
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
[GitHub] [airflow] potiuk commented on a change in pull request #12853: Add conditional version retrieval from setup.
Posted by GitBox <gi...@apache.org>.
potiuk commented on a change in pull request #12853:
URL: https://github.com/apache/airflow/pull/12853#discussion_r537061636
##########
File path: airflow/version.py
##########
@@ -24,6 +24,13 @@
except ImportError:
import importlib_metadata as metadata
-version = metadata.version('apache-airflow')
+try:
+ version = metadata.version('apache-airflow')
+except metadata.PackageNotFoundError:
+ import logging
+
+ log = logging.getLogger(__name__)
+ log.warning("Package metadata could not be found. Overriding it with version found in setup.py")
+ from setup import version
Review comment:
This is actually a protection against the case when you think you have airflow installed from the package (i.e. in production) but you actually don't (for example you have it installed with `pip -e .`. I think all production installations should be installed from packages (this is what I am working on in #12685. So the warning is deliberate here to be warned if that's the case.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
[GitHub] [airflow] potiuk commented on pull request #12853: Add conditional version retrieval from setup.
Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #12853:
URL: https://github.com/apache/airflow/pull/12853#issuecomment-739546753
> I thought we hardcoded Airflow Version in this file. Not sure when this changed. Will take a look when I am on laptop.
>
> Feel free to merge, as my question does not actually is concerned with the change in this PR
It was change by @ashb last week (followed by my previous change that I added pre-commit to sync between the two)..
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
[GitHub] [airflow] potiuk commented on a change in pull request #12853: Add conditional version retrieval from setup.
Posted by GitBox <gi...@apache.org>.
potiuk commented on a change in pull request #12853:
URL: https://github.com/apache/airflow/pull/12853#discussion_r537061636
##########
File path: airflow/version.py
##########
@@ -24,6 +24,13 @@
except ImportError:
import importlib_metadata as metadata
-version = metadata.version('apache-airflow')
+try:
+ version = metadata.version('apache-airflow')
+except metadata.PackageNotFoundError:
+ import logging
+
+ log = logging.getLogger(__name__)
+ log.warning("Package metadata could not be found. Overriding it with version found in setup.py")
+ from setup import version
Review comment:
This is actually a protection against the case when you think you have airflow installed from the package (i.e. in production) but you actually don't (for example you have it installed with `pip -e .`).
I think all production installations should be installed from packages (this is what I am working on in #12685. So the warning is deliberate here to be warned if that's the case.
Of course you will see in development as well, But I am not too worried about it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
[GitHub] [airflow] potiuk edited a comment on pull request #12853: Add conditional version retrieval from setup.
Posted by GitBox <gi...@apache.org>.
potiuk edited a comment on pull request #12853:
URL: https://github.com/apache/airflow/pull/12853#issuecomment-739546753
> I thought we hardcoded Airflow Version in this file. Not sure when this changed. Will take a look when I am on laptop.
>
> Feel free to merge, as my question does not actually is concerned with the change in this PR
It was change by @ashb last week (following my previous change that I added pre-commit to sync between the two)..
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
[GitHub] [airflow] turbaszek commented on a change in pull request #12853: Add conditional version retrieval from setup.
Posted by GitBox <gi...@apache.org>.
turbaszek commented on a change in pull request #12853:
URL: https://github.com/apache/airflow/pull/12853#discussion_r537060123
##########
File path: airflow/version.py
##########
@@ -24,6 +24,13 @@
except ImportError:
import importlib_metadata as metadata
-version = metadata.version('apache-airflow')
+try:
+ version = metadata.version('apache-airflow')
+except metadata.PackageNotFoundError:
+ import logging
+
+ log = logging.getLogger(__name__)
+ log.warning("Package metadata could not be found. Overriding it with version found in setup.py")
+ from setup import version
Review comment:
Is this logging necessary? Is there a possibility that the version may differ?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
[GitHub] [airflow] github-actions[bot] commented on pull request #12853: Add conditional version retrieval from setup.
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #12853:
URL: https://github.com/apache/airflow/pull/12853#issuecomment-739543565
The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest master at your convenience, or amend the last commit of the PR, and push it with --force-with-lease.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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