This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v1-10-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit db57efa96dbec879f8962c24a4abb6a6056a9c8c Author: Felix Uellendall <[email protected]> AuthorDate: Sun Jun 14 02:37:30 2020 +0200 Update pre-commit-hooks repo version (#9195) - use official yamllint pre-commit-hook - run isort pre-commit-hook on all python files instead of files ending with py (cherry picked from commit 1698db4ac103e27b0af132b6002d2e0473c9344b) --- .pre-commit-config.yaml | 59 +++++++++++++++++++++++++------------------------ dev/airflow-jira | 6 ++--- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b1852b7..ed27b09 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -140,7 +140,7 @@ repos: hooks: - id: check-hooks-apply - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.5.0 + rev: v3.1.0 hooks: - id: check-merge-conflict - id: debug-statements @@ -155,45 +155,46 @@ repos: hooks: - id: rst-backticks - id: python-no-log-warn - - repo: local + - repo: https://github.com/adrienverge/yamllint + rev: v1.23.0 hooks: - id: yamllint name: Check yaml files with yamllint entry: yamllint -c yamllint-config.yml - language: python - additional_dependencies: ['yamllint'] types: [yaml] exclude: ^.*init_git_sync\.template\.yaml$|^.*airflow\.template\.yaml$ + ## + ## Dear committer. + ## + ## If you ever come here to add the missing isort step here - hear a little warning. + ## + ## Initially isort will cause surprising duplicates of urlparse and other urllib related methods. + ## The urllib imports seem broken for python 2 but they are actually fine due to future + ## backport aliases installed elsewhere in the code (implicitly) - in 6 places. + ## + ## When you decide how to fix it (likely talking to other people in community) and you push + ## build to CI you will find terrible truth that in Airflow 1.10 modules are so much + ## cross-dependent, that imports in a number of places have to be done in specific order and + ## if this is not followed properly, circular imports kick-in and you are doomed. + ## + ## Running isort breaks the import House of Cards and there is no easy way to fix it short of + ## splitting a number of files and probably breaking compatibility. + ## + ## Luckily this has been fixed in Airflow 2.0 by proper untangling of the cross-dependencies and + ## 1.10.* branch is really in maintenance mode, so do not really waste your time here. + ## + ## Unless you really want of course. But then either delete this comment or increase the counter + ## below after you give up. + ## + ## Total hours wasted here = 3 + ## + - repo: local + hooks: - id: shellcheck name: Check Shell scripts syntax correctness language: docker_image entry: koalaman/shellcheck:stable -x -a files: ^breeze$|^breeze-complete$|\.sh$|^hooks/build$|^hooks/push$|\.bash$|\.bats$ - ## - ## Dear committer. - ## - ## If you ever come here to add the missing isort step here - hear a little warning. - ## - ## Initially isort will cause surprising duplicates of urlparse and other urllib related methods. - ## The urllib imports seem broken for python 2 but they are actually fine due to future - ## backport aliases installed elsewhere in the code (implicitly) - in 6 places. - ## - ## When you decide how to fix it (likely talking to other people in community) and you push - ## build to CI you will find terrible truth that in Airflow 1.10 modules are so much - ## cross-dependent, that imports in a number of places have to be done in specific order and - ## if this is not followed properly, circular imports kick-in and you are doomed. - ## - ## Running isort breaks the import House of Cards and there is no easy way to fix it short of - ## splitting a number of files and probably breaking compatibility. - ## - ## Luckily this has been fixed in Airflow 2.0 by proper untangling of the cross-dependencies and - ## 1.10.* branch is really in maintenance mode, so do not really waste your time here. - ## - ## Unless you really want of course. But then either delete this comment or increase the counter - ## below after you give up. - ## - ## Total hours wasted here = 3 - ## - id: lint-dockerfile name: Lint dockerfile language: system diff --git a/dev/airflow-jira b/dev/airflow-jira index dc006a8..ef9910a 100755 --- a/dev/airflow-jira +++ b/dev/airflow-jira @@ -20,11 +20,11 @@ # This tool is based on the Spark merge_spark_pr script: # https://github.com/apache/spark/blob/master/dev/merge_spark_pr.py -from collections import defaultdict, Counter - -import jira import re import sys +from collections import Counter, defaultdict + +import jira PROJECT = "AIRFLOW"
