This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v2-3-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 5c7b7993b8338b465e658adc18651675134d52e7 Author: Jarek Potiuk <[email protected]> AuthorDate: Thu Jun 23 02:37:40 2022 +0200 Fix errors revealed on autoupgrade of breeze (#24612) Recent changes to Breeze cause it to fail in certain situations, especially at self-upgrade (which was generated by today's upgrade with rich-click). There were two problems: * docker volume inspect missed 'volume' and it caused sometimes failures in CI * inputimeout dependency was missing after recent update to pre-commit venvs (cherry picked from commit 0905e386f17e34d96f6ee575404c62b13242c75d) --- .pre-commit-config.yaml | 16 ++++++++-------- dev/breeze/src/airflow_breeze/utils/path_utils.py | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index af0c2b0e1c..d91d2bf332 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -778,7 +778,7 @@ repos: entry: ./scripts/ci/pre_commit/pre_commit_mypy.py files: ^dev/.*\.py$ require_serial: true - additional_dependencies: ['rich>=12.4.4'] + additional_dependencies: ['rich>=12.4.4', 'inputimeout'] - id: run-mypy name: Run mypy for core language: python @@ -786,14 +786,14 @@ repos: files: \.py$ exclude: ^provider_packages|^docs|^airflow/_vendor/|^airflow/providers|^airflow/migrations|^dev require_serial: true - additional_dependencies: ['rich>=12.4.4'] + additional_dependencies: ['rich>=12.4.4', 'inputimeout'] - id: run-mypy name: Run mypy for providers language: python entry: ./scripts/ci/pre_commit/pre_commit_mypy.py --namespace-packages files: ^airflow/providers/.*\.py$ require_serial: true - additional_dependencies: ['rich>=12.4.4'] + additional_dependencies: ['rich>=12.4.4', 'inputimeout'] - id: run-mypy name: Run mypy for /docs/ folder language: python @@ -801,7 +801,7 @@ repos: files: ^docs/.*\.py$ exclude: ^docs/rtd-deprecation require_serial: true - additional_dependencies: ['rich>=12.4.4'] + additional_dependencies: ['rich>=12.4.4', 'inputimeout'] - id: run-flake8 name: Run flake8 language: python @@ -809,7 +809,7 @@ repos: files: \.py$ pass_filenames: true exclude: ^airflow/_vendor/ - additional_dependencies: ['rich>=12.4.4'] + additional_dependencies: ['rich>=12.4.4', 'inputimeout'] - id: lint-javascript name: ESLint against airflow/ui language: python @@ -817,7 +817,7 @@ repos: files: ^airflow/ui/ entry: ./scripts/ci/pre_commit/pre_commit_ui_lint.py pass_filenames: false - additional_dependencies: ['rich>=12.4.4'] + additional_dependencies: ['rich>=12.4.4', 'inputimeout'] - id: lint-javascript name: ESLint against current UI JavaScript files language: python @@ -825,12 +825,12 @@ repos: files: ^airflow/www/static/js/ entry: ./scripts/ci/pre_commit/pre_commit_www_lint.py pass_filenames: false - additional_dependencies: ['rich>=12.4.4'] + additional_dependencies: ['rich>=12.4.4', 'inputimeout'] - id: update-migration-references name: Update migration ref doc language: python entry: ./scripts/ci/pre_commit/pre_commit_migration_reference.py pass_filenames: false files: ^airflow/migrations/versions/.*\.py$|^docs/apache-airflow/migrations-ref\.rst$ - additional_dependencies: ['rich>=12.4.4'] + additional_dependencies: ['rich>=12.4.4', 'inputimeout'] ## ONLY ADD PRE-COMMITS HERE THAT REQUIRE CI IMAGE diff --git a/dev/breeze/src/airflow_breeze/utils/path_utils.py b/dev/breeze/src/airflow_breeze/utils/path_utils.py index e4e79d5520..c7ee6d9802 100644 --- a/dev/breeze/src/airflow_breeze/utils/path_utils.py +++ b/dev/breeze/src/airflow_breeze/utils/path_utils.py @@ -253,7 +253,9 @@ BREEZE_SOURCES_ROOT = AIRFLOW_SOURCES_ROOT / "dev" / "breeze" def create_volume_if_missing(volume_name: str): from airflow_breeze.utils.run_utils import run_command - res_inspect = run_command(cmd=["docker", "inspect", volume_name], stdout=subprocess.DEVNULL, check=False) + res_inspect = run_command( + cmd=["docker", "volume", "inspect", volume_name], stdout=subprocess.DEVNULL, check=False + ) if res_inspect.returncode != 0: run_command(cmd=["docker", "volume", "create", volume_name], check=True)
