[AIRFLOW-5362] Reorder imports (#5944)

    (cherry picked from commit d719e1f)

.pre-commit-config.yaml

@@ -75,7 +75,7 @@ repos:
       - id: insert-license
         name: Add license for all JS files
         files: \.js$
-        exclude: ^\.github/.*$|^airflow/_vendor/.*$|^airflow/www/static/.*$
+        exclude: ^\.github/.*$|^airflow/_vendor/.*$|^airflow/www/static/.*|^airflow/www_rbac/static/.*$
         args:
           - --comment-style
           - "/**| *| */"
@@ -190,6 +190,14 @@ repos:
         entry: "./scripts/ci/pre_commit_lint_dockerfile.sh"
         files: ^Dockerfile.*$
         pass_filenames: true
+      - id: isort
+        name: Run isort to sort imports
+        language: python
+        entry: isort
+        files: \.py$
+        # To keep consistent with the global isort skip config defined in setup.cfg
+        exclude: ^airflow/_vendor/.*$|^build/.*$|^.tox/.*$|^venv/.*$
+        additional_dependencies: ['isort']
       - id: update-breeze-file
         name: Update output of breeze command in BREEZE.rst
         entry: "./scripts/ci/pre_commit_breeze_cmd_line.sh"
@@ -230,3 +238,16 @@ repos:
         files: \.py$
         pass_filenames: true
         require_serial: true
+      - id: mypy
+        name: Run mypy
+        language: system
+        entry: "./scripts/ci/pre_commit_mypy.sh"
+        files: \.py$
+        exclude: ^airflow/_vendor/.*$
+        pass_filenames: true
+      - id: flake8
+        name: Run flake8
+        language: system
+        entry: "./scripts/ci/pre_commit_flake8.sh"
+        files: \.py$
+        pass_filenames: true

BREEZE.rst

@@ -959,7 +959,7 @@ This is the current syntax for  `./breeze <./breeze>`_:
 
   -K, --kubernetes-version <KUBERNETES_VERSION>
           Kubernetes version - only used in case of 'kubernetes' environment.
-          One of [ v1.13.0 ]. Default: v1.13.0
+          One of [ v1.13.0 v1.15.3 ]. Default: v1.13.0
 
   -M, --kubernetes-mode <KUBERNETES_MODE>
           Kubernetes mode - only used in case of 'kubernetes' environment.

airflow/api/__init__.py

@@ -20,15 +20,14 @@
 
 from __future__ import print_function
 
-from importlib import import_module
 import warnings
+from importlib import import_module
 
 import lazy_object_proxy
 from zope.deprecation import deprecated
 
-from airflow.exceptions import AirflowException, AirflowConfigException
 from airflow.configuration import conf
-
+from airflow.exceptions import AirflowConfigException, AirflowException
 from airflow.utils.log.logging_mixin import LoggingMixin
 
 

airflow/api/client/local_client.py

@@ -19,9 +19,7 @@
 """Local client API"""
 
 from airflow.api.client import api_client
-from airflow.api.common.experimental import pool
-from airflow.api.common.experimental import trigger_dag
-from airflow.api.common.experimental import delete_dag
+from airflow.api.common.experimental import delete_dag, pool, trigger_dag
 
 
 class Client(api_client.Client):

airflow/api/common/experimental/__init__.py

@@ -20,7 +20,7 @@
 from datetime import datetime
 from typing import Optional
 
-from airflow.exceptions import DagNotFound, TaskNotFound, DagRunNotFound
+from airflow.exceptions import DagNotFound, DagRunNotFound, TaskNotFound
 from airflow.models import DagBag, DagModel, DagRun
 
 

airflow/api/common/experimental/get_dag_runs.py

@@ -17,7 +17,7 @@
 # specific language governing permissions and limitations
 # under the License.
 """DAG runs APIs."""
-from typing import Optional, List, Dict, Any
+from typing import Any, Dict, List, Optional
 
 from flask import url_for
 

airflow/api/common/experimental/trigger_dag.py

@@ -19,10 +19,10 @@
 """Triggering DAG runs APIs."""
 import json
 from datetime import datetime
-from typing import Union, Optional, List
+from typing import List, Optional, Union
 
-from airflow.exceptions import DagRunAlreadyExists, DagNotFound
-from airflow.models import DagRun, DagBag, DagModel
+from airflow.exceptions import DagNotFound, DagRunAlreadyExists
+from airflow.models import DagBag, DagModel, DagRun
 from airflow.utils import timezone
 from airflow.utils.state import State
 

airflow/bin/airflow

@@ -22,8 +22,8 @@ import os
 
 import argcomplete
 
-from airflow.configuration import conf
 from airflow.bin.cli import CLIFactory
+from airflow.configuration import conf
 
 if __name__ == '__main__':
 

airflow/config_templates/airflow_local_settings.py

@@ -18,7 +18,7 @@
 # under the License.
 
 import os
-from typing import Dict, Any
+from typing import Any, Dict
 
 import six
 

airflow/config_templates/default_webserver_config.py

@@ -18,13 +18,16 @@
 # under the License.
 """Default configuration for the Airflow webserver"""
 import os
+
 from flask_appbuilder.security.manager import AUTH_DB
+
+from airflow.configuration import conf
+
 # from flask_appbuilder.security.manager import AUTH_LDAP
 # from flask_appbuilder.security.manager import AUTH_OAUTH
 # from flask_appbuilder.security.manager import AUTH_OID
 # from flask_appbuilder.security.manager import AUTH_REMOTE_USER
 
-from airflow.configuration import conf
 
 basedir = os.path.abspath(os.path.dirname(__file__))
 

airflow/contrib/auth/backends/github_enterprise_auth.py

@@ -17,13 +17,10 @@
 # specific language governing permissions and limitations
 # under the License.
 import flask_login
-
+from flask import redirect, request, url_for
 # Need to expose these downstream
 # flake8: noqa: F401
-from flask_login import current_user, logout_user, login_required, login_user
-
-from flask import url_for, redirect, request
-
+from flask_login import current_user, login_required, login_user, logout_user
 from flask_oauthlib.client import OAuth
 
 from airflow import models

airflow/contrib/auth/backends/google_auth.py

@@ -17,13 +17,10 @@
 # specific language governing permissions and limitations
 # under the License.
 import flask_login
-
+from flask import redirect, request, url_for
 # Need to expose these downstream
 # flake8: noqa: F401
-from flask_login import current_user, logout_user, login_required, login_user
-
-from flask import url_for, redirect, request
-
+from flask_login import current_user, login_required, login_user, logout_user
 from flask_oauthlib.client import OAuth
 
 from airflow import models

airflow/contrib/auth/backends/ldap_auth.py

@@ -16,27 +16,21 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from future.utils import native
+import re
+import ssl
+import traceback
 
 import flask_login
-from flask_login import login_required, current_user, logout_user  # noqa: F401
-from flask import flash
+from flask import flash, redirect, url_for
+from flask_login import current_user, login_required, logout_user  # noqa: F401
+from future.utils import native
+from ldap3 import LEVEL, SUBTREE, Connection, Server, Tls, set_config_parameter
 from wtforms import Form, PasswordField, StringField
 from wtforms.validators import InputRequired
 
-from ldap3 import Server, Connection, Tls, set_config_parameter, LEVEL, SUBTREE
-import ssl
-
-from flask import url_for, redirect
-
 from airflow import models
-from airflow.configuration import conf
-from airflow.configuration import AirflowConfigException
+from airflow.configuration import AirflowConfigException, conf
 from airflow.utils.db import provide_session
-
-import traceback
-import re
-
 from airflow.utils.log.logging_mixin import LoggingMixin
 
 LOGIN_MANAGER = flask_login.LoginManager()

airflow/contrib/auth/backends/password_auth.py

@@ -23,24 +23,19 @@
 from functools import wraps
 from sys import version_info
 
-from flask import flash, Response
-from flask import url_for, redirect, make_response
-from flask_bcrypt import generate_password_hash, check_password_hash
-
 import flask_login
+from flask import Response, flash, make_response, redirect, url_for
+from flask_bcrypt import check_password_hash, generate_password_hash
 # noinspection PyUnresolvedReferences
 # pylint: disable=unused-import
-from flask_login import login_required, current_user, logout_user  # noqa: F401
-# pylint: enable=unused-import
-
-from wtforms import Form, PasswordField, StringField
-from wtforms.validators import InputRequired
-
+from flask_login import current_user, login_required, logout_user  # noqa: F401
 from sqlalchemy import Column, String
 from sqlalchemy.ext.hybrid import hybrid_property
+from wtforms import Form, PasswordField, StringField
+from wtforms.validators import InputRequired
 
 from airflow import models
-from airflow.utils.db import provide_session, create_session
+from airflow.utils.db import create_session, provide_session
 from airflow.utils.log.logging_mixin import LoggingMixin
 
 LOGIN_MANAGER = flask_login.LoginManager()

airflow/contrib/example_dags/example_azure_cosmosdb_sensor.py

@@ -28,8 +28,8 @@
 """
 
 from airflow import DAG
-from airflow.contrib.sensors.azure_cosmos_sensor import AzureCosmosDocumentSensor
 from airflow.contrib.operators.azure_cosmos_operator import AzureCosmosInsertDocumentOperator
+from airflow.contrib.sensors.azure_cosmos_sensor import AzureCosmosDocumentSensor
 from airflow.utils import dates
 
 default_args = {

airflow/contrib/example_dags/example_databricks_operator.py

@@ -33,11 +33,9 @@
 """
 
 import airflow
-
 from airflow import DAG
 from airflow.contrib.operators.databricks_operator import DatabricksSubmitRunOperator
 
-
 default_args = {
     'owner': 'Airflow',
     'email': ['[email protected]'],

airflow/contrib/example_dags/example_dingding_operator.py

@@ -25,7 +25,6 @@
 from airflow import DAG
 from airflow.contrib.operators.dingding_operator import DingdingOperator
 
-
 args = {
     'owner': 'Airflow',
     'retries': 3,

airflow/contrib/example_dags/example_emr_job_flow_automatic_steps.py

@@ -20,10 +20,10 @@
 This is an example dag for a AWS EMR Pipeline with auto steps.
 """
 from datetime import timedelta
+
 import airflow
 from airflow import DAG
-from airflow.contrib.operators.emr_create_job_flow_operator \
-    import EmrCreateJobFlowOperator
+from airflow.contrib.operators.emr_create_job_flow_operator import EmrCreateJobFlowOperator
 from airflow.contrib.sensors.emr_job_flow_sensor import EmrJobFlowSensor
 
 DEFAULT_ARGS = {

airflow/contrib/example_dags/example_emr_job_flow_manual_steps.py

@@ -26,13 +26,10 @@
 
 import airflow
 from airflow import DAG
-from airflow.contrib.operators.emr_create_job_flow_operator \
-    import EmrCreateJobFlowOperator
-from airflow.contrib.operators.emr_add_steps_operator \
-    import EmrAddStepsOperator
+from airflow.contrib.operators.emr_add_steps_operator import EmrAddStepsOperator
+from airflow.contrib.operators.emr_create_job_flow_operator import EmrCreateJobFlowOperator
+from airflow.contrib.operators.emr_terminate_job_flow_operator import EmrTerminateJobFlowOperator
 from airflow.contrib.sensors.emr_step_sensor import EmrStepSensor
-from airflow.contrib.operators.emr_terminate_job_flow_operator \
-    import EmrTerminateJobFlowOperator
 
 DEFAULT_ARGS = {
     'owner': 'Airflow',

airflow/contrib/example_dags/example_kubernetes_executor_config.py

@@ -28,7 +28,6 @@
 from airflow.models import DAG
 from airflow.operators.python_operator import PythonOperator
 
-
 default_args = {
     'owner': 'Airflow',
     'start_date': airflow.utils.dates.days_ago(2)

airflow/contrib/example_dags/example_kubernetes_operator.py

@@ -19,9 +19,9 @@
 """
 This is an example dag for using the KubernetesPodOperator.
 """
+from airflow.models import DAG
 from airflow.utils.dates import days_ago
 from airflow.utils.log.logging_mixin import LoggingMixin
-from airflow.models import DAG
 
 log = LoggingMixin().log
 

airflow/contrib/example_dags/example_papermill_operator.py

@@ -25,11 +25,9 @@
 from datetime import timedelta
 
 import airflow
-
 from airflow.models import DAG
 from airflow.operators.papermill_operator import PapermillOperator
 
-
 default_args = {
     'owner': 'Airflow',
     'start_date': airflow.utils.dates.days_ago(2)

airflow/contrib/example_dags/example_qubole_operator.py

@@ -35,7 +35,7 @@
 from airflow import DAG
 from airflow.contrib.operators.qubole_operator import QuboleOperator
 from airflow.operators.dummy_operator import DummyOperator
-from airflow.operators.python_operator import PythonOperator, BranchPythonOperator
+from airflow.operators.python_operator import BranchPythonOperator, PythonOperator
 
 default_args = {
     'owner': 'Airflow',

airflow/contrib/example_dags/example_twitter_dag.py

@@ -37,7 +37,6 @@
 from airflow.operators.hive_operator import HiveOperator
 from airflow.operators.python_operator import PythonOperator
 
-
 # --------------------------------------------------------------------------------
 # Create a few placeholder scripts. In practice these would be different python
 # script files, which are imported in this section with absolute or relative imports

airflow/contrib/example_dags/example_winrm_operator.py

@@ -37,7 +37,6 @@
 from airflow.models import DAG
 from airflow.operators.dummy_operator import DummyOperator
 
-
 default_args = {
     'owner': 'Airflow',
     'start_date': airflow.utils.dates.days_ago(2)

airflow/contrib/hooks/aws_athena_hook.py

@@ -21,6 +21,7 @@
 This module contains AWS Athena hook
 """
 from time import sleep
+
 from airflow.contrib.hooks.aws_hook import AwsHook
 
 

airflow/contrib/hooks/aws_dynamodb_hook.py

@@ -21,8 +21,8 @@
 """
 This module contains the AWS DynamoDB hook
 """
-from airflow.exceptions import AirflowException
 from airflow.contrib.hooks.aws_hook import AwsHook
+from airflow.exceptions import AirflowException
 
 
 class AwsDynamoDBHook(AwsHook):

airflow/contrib/hooks/aws_hook.py

@@ -21,8 +21,9 @@
 This module contains Base AWS Hook
 """
 
-import logging
 import configparser
+import logging
+
 import boto3
 
 from airflow.exceptions import AirflowException