This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 57670802ec Rename SKIP_UPRADE_CHECK to SKIP_BREEZE_SELF_UPGRADE_CHECK
(#35876)
57670802ec is described below
commit 57670802ec8f415884518950107497200d09ce96
Author: Jarek Potiuk <[email protected]>
AuthorDate: Mon Nov 27 03:09:25 2023 +0100
Rename SKIP_UPRADE_CHECK to SKIP_BREEZE_SELF_UPGRADE_CHECK (#35876)
The variable name used for self-upgrade check avoidance in Breeze
was named SKIP_UPGRADE_CHECK but it was quite a bit ambiguous
especially after adding SKIP_IMAGE_UPGRADE_CHECK.
The new name is more explicit, renamed also breeze method running
the check for consistency.
---
BREEZE.rst | 2 +-
dev/breeze/src/airflow_breeze/utils/path_utils.py | 8 ++++----
dev/breeze/src/airflow_breeze/utils/reinstall.py | 2 +-
scripts/ci/pre_commit/pre_commit_breeze_cmd_line.py | 2 +-
scripts/ci/pre_commit/pre_commit_local_yml_mounts.py | 2 +-
scripts/ci/pre_commit/pre_commit_mypy.py | 2 +-
scripts/ci/pre_commit/pre_commit_update_er_diagram.py | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/BREEZE.rst b/BREEZE.rst
index b945bd9dc9..ee350cbc8e 100644
--- a/BREEZE.rst
+++ b/BREEZE.rst
@@ -2804,7 +2804,7 @@ make sure to follow these steps:
* choose ``module`` to run and set it to ``airflow_breeze.breeze`` - this is
the entrypoint of breeze
* add parameters you want to run breeze with (for example ``ci-image build``
if you want to debug
how breeze builds the CI image
-* set ``SKIP_UPGRADE_CHECK`` environment variable to ``true`` to bypass
built-in upgrade check of breeze,
+* set ``SKIP_BREEZE_SELF_UPGRADE_CHECK`` environment variable to ``true`` to
bypass built-in upgrade check of breeze,
this will bypass the check we run in Breeze to see if there are new
requirements to install for it
See example configuration for PyCharm which has run/debug configuration for
diff --git a/dev/breeze/src/airflow_breeze/utils/path_utils.py
b/dev/breeze/src/airflow_breeze/utils/path_utils.py
index ced497229e..cfda50b802 100644
--- a/dev/breeze/src/airflow_breeze/utils/path_utils.py
+++ b/dev/breeze/src/airflow_breeze/utils/path_utils.py
@@ -60,13 +60,13 @@ def in_help() -> bool:
return "--help" in sys.argv or "-h" in sys.argv
-def skip_upgrade_check():
+def skip_breeze_self_upgrade_check():
return (
in_self_upgrade()
or in_autocomplete()
or in_help()
or hasattr(sys, "_called_from_test")
- or os.environ.get("SKIP_UPGRADE_CHECK")
+ or os.environ.get("SKIP_BREEZE_SELF_UPGRADE_CHECK")
)
@@ -243,7 +243,7 @@ def find_airflow_sources_root_to_operate_on() -> Path:
if sources_root_from_env:
return Path(sources_root_from_env)
installation_airflow_sources = get_installation_airflow_sources()
- if installation_airflow_sources is None and not skip_upgrade_check():
+ if installation_airflow_sources is None and not
skip_breeze_self_upgrade_check():
get_console().print(
"\n[error]Breeze should only be installed with -e flag[/]\n\n"
"[warning]Please go to Airflow sources and run[/]\n\n"
@@ -254,7 +254,7 @@ def find_airflow_sources_root_to_operate_on() -> Path:
)
sys.exit(1)
airflow_sources = get_used_airflow_sources()
- if not skip_upgrade_check():
+ if not skip_breeze_self_upgrade_check():
# only print warning and sleep if not producing complete results
reinstall_if_different_sources(airflow_sources)
reinstall_if_setup_changed()
diff --git a/dev/breeze/src/airflow_breeze/utils/reinstall.py
b/dev/breeze/src/airflow_breeze/utils/reinstall.py
index 228db55654..de3da92855 100644
--- a/dev/breeze/src/airflow_breeze/utils/reinstall.py
+++ b/dev/breeze/src/airflow_breeze/utils/reinstall.py
@@ -39,7 +39,7 @@ def reinstall_breeze(breeze_sources: Path, re_run: bool =
True):
if re_run:
# Make sure we don't loop forever if the metadata hash hasn't been
updated yet (else it is tricky to
# run pre-commit checks via breeze!)
- os.environ["SKIP_UPGRADE_CHECK"] = "true"
+ os.environ["SKIP_BREEZE_SELF_UPGRADE_CHECK"] = "true"
os.execl(sys.executable, sys.executable, *sys.argv)
get_console().print(f"\n[info]Breeze has been reinstalled from
{breeze_sources}. Exiting now.[/]\n\n")
sys.exit(0)
diff --git a/scripts/ci/pre_commit/pre_commit_breeze_cmd_line.py
b/scripts/ci/pre_commit/pre_commit_breeze_cmd_line.py
index ede477c548..8ee4a9db21 100755
--- a/scripts/ci/pre_commit/pre_commit_breeze_cmd_line.py
+++ b/scripts/ci/pre_commit/pre_commit_breeze_cmd_line.py
@@ -76,7 +76,7 @@ if __name__ == "__main__":
os.environ["AIRFLOW_SOURCES_ROOT"] = str(AIRFLOW_SOURCES_DIR)
# needed to keep consistent output
os.environ["PYTHONPATH"] = str(BREEZE_SOURCES_DIR)
- os.environ["SKIP_UPGRADE_CHECK"] = "true"
+ os.environ["SKIP_BREEZE_SELF_UPGRADE_CHECK"] = "true"
return_code = 0
verify_all_commands_described_in_docs()
if is_regeneration_needed():
diff --git a/scripts/ci/pre_commit/pre_commit_local_yml_mounts.py
b/scripts/ci/pre_commit/pre_commit_local_yml_mounts.py
index 97ffccfbe6..d136b83a31 100755
--- a/scripts/ci/pre_commit/pre_commit_local_yml_mounts.py
+++ b/scripts/ci/pre_commit/pre_commit_local_yml_mounts.py
@@ -22,7 +22,7 @@ import sys
from pathlib import Path
if __name__ == "__main__":
- os.environ["SKIP_UPGRADE_CHECK"] = "true"
+ os.environ["SKIP_BREEZE_SELF_UPGRADE_CHECK"] = "true"
sys.path.insert(0, str(Path(__file__).parent.resolve())) # make sure
common_precommit_utils is imported
from common_precommit_utils import AIRFLOW_SOURCES_ROOT_PATH # isort: skip
diff --git a/scripts/ci/pre_commit/pre_commit_mypy.py
b/scripts/ci/pre_commit/pre_commit_mypy.py
index 35f8a687e8..9a51babc01 100755
--- a/scripts/ci/pre_commit/pre_commit_mypy.py
+++ b/scripts/ci/pre_commit/pre_commit_mypy.py
@@ -35,7 +35,7 @@ os.environ["SKIP_GROUP_OUTPUT"] = "true"
if __name__ == "__main__":
sys.path.insert(0, str(Path(__file__).parent.resolve())) # make sure
common_precommit_utils is imported
- os.environ["SKIP_UPGRADE_CHECK"] = "true"
+ os.environ["SKIP_BREEZE_SELF_UPGRADE_CHECK"] = "true"
from common_precommit_utils import filter_out_providers_on_non_main_branch
sys.path.insert(0, str(AIRFLOW_SOURCES / "dev" / "breeze" / "src"))
diff --git a/scripts/ci/pre_commit/pre_commit_update_er_diagram.py
b/scripts/ci/pre_commit/pre_commit_update_er_diagram.py
index 89f3111bf9..0812065e67 100755
--- a/scripts/ci/pre_commit/pre_commit_update_er_diagram.py
+++ b/scripts/ci/pre_commit/pre_commit_update_er_diagram.py
@@ -33,7 +33,7 @@ if __name__ == "__main__":
sys.path.insert(0, str(AIRFLOW_SOURCES / "dev" / "breeze" / "src"))
GITHUB_REPOSITORY = os.environ.get("GITHUB_REPOSITORY", "apache/airflow")
os.environ["SKIP_GROUP_OUTPUT"] = "true"
- os.environ["SKIP_UPGRADE_CHECK"] = "true"
+ os.environ["SKIP_BREEZE_SELF_UPGRADE_CHECK"] = "true"
from airflow_breeze.global_constants import
DEFAULT_PYTHON_MAJOR_MINOR_VERSION, MOUNT_SELECTED
from airflow_breeze.params.shell_params import ShellParams
from airflow_breeze.utils.console import get_console
