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 ec776de518 Use str.splitlines() to split lines in breeze (#33594)
ec776de518 is described below
commit ec776de51872f9940c2270c1a9aa4dd2f6f6d60b
Author: Miroslav Šedivý <[email protected]>
AuthorDate: Thu Aug 24 10:32:23 2023 +0000
Use str.splitlines() to split lines in breeze (#33594)
---
dev/breeze/src/airflow_breeze/commands/developer_commands.py | 2 +-
dev/breeze/src/airflow_breeze/utils/backtracking.py | 2 +-
dev/breeze/src/airflow_breeze/utils/cdxgen.py | 6 +++---
dev/breeze/src/airflow_breeze/utils/docs_errors.py | 2 +-
dev/breeze/src/airflow_breeze/utils/github.py | 2 +-
dev/breeze/src/airflow_breeze/utils/publish_docs_helpers.py | 2 +-
dev/breeze/src/airflow_breeze/utils/run_utils.py | 4 ++--
dev/breeze/src/airflow_breeze/utils/spelling_checks.py | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dev/breeze/src/airflow_breeze/commands/developer_commands.py
b/dev/breeze/src/airflow_breeze/commands/developer_commands.py
index 671ced7d5a..629354f366 100644
--- a/dev/breeze/src/airflow_breeze/commands/developer_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/developer_commands.py
@@ -779,7 +779,7 @@ def find_airflow_container() -> str | None:
return None
output = docker_compose_ps_command.stdout
- container_info = output.strip().split("\n")
+ container_info = output.strip().splitlines()
if container_info:
container_running = container_info[-1].split(" ")[0]
if container_running.startswith("-"):
diff --git a/dev/breeze/src/airflow_breeze/utils/backtracking.py
b/dev/breeze/src/airflow_breeze/utils/backtracking.py
index 9125d1da0a..d719be8d0d 100644
--- a/dev/breeze/src/airflow_breeze/utils/backtracking.py
+++ b/dev/breeze/src/airflow_breeze/utils/backtracking.py
@@ -45,7 +45,7 @@ def print_backtracking_candidates():
last_constraint_date = match_generated_date(constraints_text)
get_console().print(f"Last constraint date: {last_constraint_date}")
dependency_array = [
- dep for dep in constraints_text.split("\n") if not dep.startswith("#")
and not dep.strip() == ""
+ dep for dep in constraints_text.splitlines() if not
dep.startswith("#") and dep.strip()
]
candidates_for_backtracking = []
for x in dependency_array:
diff --git a/dev/breeze/src/airflow_breeze/utils/cdxgen.py
b/dev/breeze/src/airflow_breeze/utils/cdxgen.py
index 40e36b903d..e72ef8fc72 100644
--- a/dev/breeze/src/airflow_breeze/utils/cdxgen.py
+++ b/dev/breeze/src/airflow_breeze/utils/cdxgen.py
@@ -182,7 +182,7 @@ chown --recursive {os.getuid()}:{os.getgid()}
{DOCKER_FILE_PREFIX}
airflow_version=airflow_version, python_version=python_version
),
"-c",
- ";".join(command.split("\n")[1:-1]),
+ ";".join(command.splitlines()[1:-1]),
]
)
target_dir = FILES_DIR / TARGET_DIR_NAME
@@ -190,12 +190,12 @@ chown --recursive {os.getuid()}:{os.getgid()}
{DOCKER_FILE_PREFIX}
provider_with_airflow_file = target_dir / provider_with_airflow_file_name
get_console().print(f"[info]Airflow requirements in {airflow_file}")
get_console().print(f"[info]Provider requirements in
{provider_with_airflow_file}")
- base_packages = set([package.split("==")[0] for package in
airflow_file.read_text().split("\n")])
+ base_packages = {package.split("==")[0] for package in
airflow_file.read_text().splitlines()}
base_packages.add("apache-airflow-providers-" + provider_id.replace(".",
"-"))
provider_packages = sorted(
[
line
- for line in provider_with_airflow_file.read_text().split("\n")
+ for line in provider_with_airflow_file.read_text().splitlines()
if line.split("==")[0] not in base_packages
]
)
diff --git a/dev/breeze/src/airflow_breeze/utils/docs_errors.py
b/dev/breeze/src/airflow_breeze/utils/docs_errors.py
index 62581d2d28..d5782486b2 100644
--- a/dev/breeze/src/airflow_breeze/utils/docs_errors.py
+++ b/dev/breeze/src/airflow_breeze/utils/docs_errors.py
@@ -94,7 +94,7 @@ def parse_sphinx_warnings(warning_text: str, docs_dir: str)
-> list[DocBuildErro
:return: list of DocBuildErrors.
"""
sphinx_build_errors = []
- for sphinx_warning in warning_text.split("\n"):
+ for sphinx_warning in warning_text.splitlines():
if not sphinx_warning:
continue
warning_parts = sphinx_warning.split(":", 2)
diff --git a/dev/breeze/src/airflow_breeze/utils/github.py
b/dev/breeze/src/airflow_breeze/utils/github.py
index 59982c2d04..18bf806dee 100644
--- a/dev/breeze/src/airflow_breeze/utils/github.py
+++ b/dev/breeze/src/airflow_breeze/utils/github.py
@@ -83,7 +83,7 @@ def get_active_airflow_versions(confirm: bool = True) ->
list[str]:
repo = Repo(AIRFLOW_SOURCES_ROOT)
all_active_tags: list[str] = []
try:
- ref_tags = repo.git.ls_remote("--tags", "apache").split("\n")
+ ref_tags = repo.git.ls_remote("--tags", "apache").splitlines()
except GitCommandError as ex:
get_console().print(
"[error]Could not fetch tags from `apache` remote! Make sure to
have it configured.\n"
diff --git a/dev/breeze/src/airflow_breeze/utils/publish_docs_helpers.py
b/dev/breeze/src/airflow_breeze/utils/publish_docs_helpers.py
index 1d7887f96f..7d41c7c7b2 100644
--- a/dev/breeze/src/airflow_breeze/utils/publish_docs_helpers.py
+++ b/dev/breeze/src/airflow_breeze/utils/publish_docs_helpers.py
@@ -138,7 +138,7 @@ def prepare_code_snippet(file_path: str, line_no: int,
context_lines_count: int
with open(file_path) as text_file:
# Highlight code
code = text_file.read()
- code_lines = code.split("\n")
+ code_lines = code.splitlines()
# Prepend line number
code_lines = [
f">{lno:3} | {line}" if line_no == lno else f"{lno:4} | {line}"
diff --git a/dev/breeze/src/airflow_breeze/utils/run_utils.py
b/dev/breeze/src/airflow_breeze/utils/run_utils.py
index f792631d8b..4517c6f5c4 100644
--- a/dev/breeze/src/airflow_breeze/utils/run_utils.py
+++ b/dev/breeze/src/airflow_breeze/utils/run_utils.py
@@ -302,14 +302,14 @@ def fix_group_permissions():
get_console().print("[info]Fixing group permissions[/]")
files_to_fix_result = run_command(["git", "ls-files", "./"],
capture_output=True, text=True)
if files_to_fix_result.returncode == 0:
- files_to_fix = files_to_fix_result.stdout.strip().split("\n")
+ files_to_fix = files_to_fix_result.stdout.strip().splitlines()
for file_to_fix in files_to_fix:
change_file_permission(Path(file_to_fix))
directories_to_fix_result = run_command(
["git", "ls-tree", "-r", "-d", "--name-only", "HEAD"],
capture_output=True, text=True
)
if directories_to_fix_result.returncode == 0:
- directories_to_fix =
directories_to_fix_result.stdout.strip().split("\n")
+ directories_to_fix =
directories_to_fix_result.stdout.strip().splitlines()
for directory_to_fix in directories_to_fix:
change_directory_permission(Path(directory_to_fix))
diff --git a/dev/breeze/src/airflow_breeze/utils/spelling_checks.py
b/dev/breeze/src/airflow_breeze/utils/spelling_checks.py
index ff7e2106b2..1dd9d7ec8c 100644
--- a/dev/breeze/src/airflow_breeze/utils/spelling_checks.py
+++ b/dev/breeze/src/airflow_breeze/utils/spelling_checks.py
@@ -91,7 +91,7 @@ def parse_spelling_warnings(warning_text: str, docs_dir: str)
-> list[SpellingEr
:return: list of SpellingError.
"""
sphinx_spelling_errors = []
- for sphinx_warning in warning_text.split("\n"):
+ for sphinx_warning in warning_text.splitlines():
if not sphinx_warning:
continue
warning_parts = None
