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 2019/05/27 02:56:44 UTC

[GitHub] [airflow] pgagnon opened a new pull request #5330: [AIRFLOW-4573] Import airflow_local_settings after prepare_classpath()

pgagnon opened a new pull request #5330: [AIRFLOW-4573] Import airflow_local_settings after prepare_classpath()
URL: https://github.com/apache/airflow/pull/5330
 
 
   Make sure you have checked _all_ steps below.
   
   ### Jira
   
   - [X] https://issues.apache.org/jira/browse/AIRFLOW-4573
   
   
   ### Description
   
   - [X] Here are some details about my PR, including screenshots of any UI changes:
   
   `settings.py` imports the contents of `airflow_local_settings.py` (which is expected to live under `$AIRFLOW_HOME/config`) before it is added to `sys.path`. Thus, unless `airflow_local_settings.py` is added manually to `PYTHONPATH` before execution, the module will not be found.
   
   This is caused by the `airflow_local_settings` module getting imported before `prepare_classpath()` is called, which is the function responsible for adding `DAGS_FOLDER`, `PLUGINS_FOLDER` and `$AIRFLOW_HOME/config` to `sys.path`.
   
   This PR moves the `airflow_local_settings` import code in `initialize()` after `prepare_classpath()` is called. Non-dunder content of `airflow_local_settings` are added manually to the 
   
   ### Tests
   
   - [ ] My PR adds the following unit tests __OR__ does not need testing for this extremely good reason:
   
   Still adjudicating test requirements.
   
   ### Commits
   
   - [X] 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](http://chris.beams.io/posts/git-commit/)":
     1. Subject is separated from body by a blank line
     1. Subject is limited to 50 characters (not including Jira issue reference)
     1. Subject does not end with a period
     1. Subject uses the imperative mood ("add", not "adding")
     1. Body wraps at 72 characters
     1. Body explains "what" and "why", not "how"
   
   ### Documentation
   
   - [X] In case of new functionality, my PR adds documentation that describes how to use it.
     - All the public functions and the classes in the PR contain docstrings that explain what it does
     - If you implement backwards incompatible changes, please leave a note in the [Updating.md](https://github.com/apache/airflow/blob/master/UPDATING.md) so we can assign it to a appropriate release
   
   No new functionality.
   
   ### Code Quality
   
   - [X] Passes `flake8`
   

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


With regards,
Apache Git Services