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 8aa2229182 Refactor: path.rglob(…) does not need ** (#33669)
8aa2229182 is described below
commit 8aa22291821327111a1bc5f0647b764880d4b9e9
Author: Miroslav Šedivý <[email protected]>
AuthorDate: Fri Aug 25 17:33:36 2023 +0000
Refactor: path.rglob(…) does not need ** (#33669)
---
dev/breeze/src/airflow_breeze/global_constants.py | 2 +-
dev/breeze/src/airflow_breeze/utils/suspended_providers.py | 4 ++--
docs/conf.py | 2 +-
scripts/ci/pre_commit/pre_commit_update_common_sql_api_stubs.py | 6 +++---
scripts/in_container/run_provider_yaml_files_check.py | 4 ++--
tests/always/test_example_dags.py | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dev/breeze/src/airflow_breeze/global_constants.py
b/dev/breeze/src/airflow_breeze/global_constants.py
index 6e07343aec..8827a4962f 100644
--- a/dev/breeze/src/airflow_breeze/global_constants.py
+++ b/dev/breeze/src/airflow_breeze/global_constants.py
@@ -312,7 +312,7 @@ AVAILABLE_INTEGRATIONS = [
"statsd",
"trino",
]
-ALL_PROVIDER_YAML_FILES =
Path(AIRFLOW_SOURCES_ROOT).glob("airflow/providers/**/provider.yaml")
+ALL_PROVIDER_YAML_FILES = Path(AIRFLOW_SOURCES_ROOT, "airflow",
"providers").rglob("provider.yaml")
with Path(AIRFLOW_SOURCES_ROOT, "generated",
"provider_dependencies.json").open() as f:
PROVIDER_DEPENDENCIES = json.load(f)
diff --git a/dev/breeze/src/airflow_breeze/utils/suspended_providers.py
b/dev/breeze/src/airflow_breeze/utils/suspended_providers.py
index df849129c2..19db6381d9 100644
--- a/dev/breeze/src/airflow_breeze/utils/suspended_providers.py
+++ b/dev/breeze/src/airflow_breeze/utils/suspended_providers.py
@@ -27,7 +27,7 @@ def get_suspended_providers_folders() -> list[str]:
skipped when running tests (without any prefix - for example apache/beam,
yandex, google etc.).
"""
suspended_providers = []
- for provider_path in AIRFLOW_PROVIDERS_ROOT.glob("**/provider.yaml"):
+ for provider_path in AIRFLOW_PROVIDERS_ROOT.rglob("provider.yaml"):
provider_yaml = yaml.safe_load(provider_path.read_text())
if provider_yaml.get("suspended"):
suspended_providers.append(
@@ -43,7 +43,7 @@ def get_suspended_provider_ids() -> list[str]:
Yields the ids of suspended providers.
"""
suspended_provider_ids = []
- for provider_path in AIRFLOW_PROVIDERS_ROOT.glob("**/provider.yaml"):
+ for provider_path in AIRFLOW_PROVIDERS_ROOT.rglob("provider.yaml"):
provider_yaml = yaml.safe_load(provider_path.read_text())
if provider_yaml.get("suspended"):
suspended_provider_ids.append(
diff --git a/docs/conf.py b/docs/conf.py
index 0618a4401d..b69f7410e7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -269,7 +269,7 @@ if PACKAGE_NAME == "apache-airflow":
elif PACKAGE_NAME != "docker-stack":
exclude_patterns.extend(
- _get_rst_filepath_from_path(f) for f in
pathlib.Path(PACKAGE_DIR).glob("**/example_dags")
+ _get_rst_filepath_from_path(f) for f in
pathlib.Path(PACKAGE_DIR).rglob("example_dags")
)
# Add any paths that contain templates here, relative to this directory.
diff --git a/scripts/ci/pre_commit/pre_commit_update_common_sql_api_stubs.py
b/scripts/ci/pre_commit/pre_commit_update_common_sql_api_stubs.py
index aa6cf82821..54d66bab37 100755
--- a/scripts/ci/pre_commit/pre_commit_update_common_sql_api_stubs.py
+++ b/scripts/ci/pre_commit/pre_commit_update_common_sql_api_stubs.py
@@ -319,7 +319,7 @@ if __name__ == "__main__":
shutil.rmtree(OUT_DIR, ignore_errors=True)
subprocess.run(
- ["stubgen", *[os.fspath(path) for path in
COMMON_SQL_ROOT.rglob("**/*.py")]],
+ ["stubgen", *[os.fspath(path) for path in
COMMON_SQL_ROOT.rglob("*.py")]],
cwd=AIRFLOW_SOURCES_ROOT_PATH,
)
total_removals, total_additions = 0, 0
@@ -327,9 +327,9 @@ if __name__ == "__main__":
if _force_override:
console.print("\n[yellow]The committed stub APIs are force-updated\n")
# reformat the generated stubs first
- for stub_path in OUT_DIR.rglob("**/*.pyi"):
+ for stub_path in OUT_DIR.rglob("*.pyi"):
write_pyi_file(stub_path, stub_path.read_text(encoding="utf-8"))
- for stub_path in OUT_DIR.rglob("**/*.pyi"):
+ for stub_path in OUT_DIR.rglob("*.pyi"):
_new_removals, _new_additions = compare_stub_files(stub_path,
force_override=_force_override)
total_removals += _new_removals
total_additions += _new_additions
diff --git a/scripts/in_container/run_provider_yaml_files_check.py
b/scripts/in_container/run_provider_yaml_files_check.py
index 956adc515f..f6fcef181f 100755
--- a/scripts/in_container/run_provider_yaml_files_check.py
+++ b/scripts/in_container/run_provider_yaml_files_check.py
@@ -582,7 +582,7 @@ def check_doc_files(yaml_files: dict[str, dict]) ->
tuple[int, int]:
console.print()
expected_logo_urls = {
f"/{f.relative_to(DOCS_DIR).as_posix()}"
- for f in DOCS_DIR.glob("integration-logos/**/*")
+ for f in (DOCS_DIR / "integration-logos").rglob("*")
if f.is_file() and not
f"/{f.relative_to(DOCS_DIR).as_posix()}".startswith(tuple(suspended_logos))
}
@@ -684,7 +684,7 @@ if __name__ == "__main__":
ProvidersManager().initialize_providers_configuration()
architecture = Architecture.get_current()
console.print(f"Verifying packages on {architecture} architecture.
Platform: {platform.machine()}.")
- provider_files_pattern =
pathlib.Path(ROOT_DIR).glob("airflow/providers/**/provider.yaml")
+ provider_files_pattern = pathlib.Path(ROOT_DIR, "airflow",
"providers").rglob("provider.yaml")
all_provider_files = sorted(str(path) for path in provider_files_pattern)
if len(sys.argv) > 1:
paths = [os.fspath(ROOT_DIR / f) for f in sorted(sys.argv[1:])]
diff --git a/tests/always/test_example_dags.py
b/tests/always/test_example_dags.py
index 9e3f7b4099..6ffc923792 100644
--- a/tests/always/test_example_dags.py
+++ b/tests/always/test_example_dags.py
@@ -38,7 +38,7 @@ def get_suspended_providers_folders() -> list[str]:
skipped when running tests (without any prefix - for example apache/beam,
yandex, google etc.).
"""
suspended_providers = []
- for provider_path in AIRFLOW_PROVIDERS_ROOT.glob("**/provider.yaml"):
+ for provider_path in AIRFLOW_PROVIDERS_ROOT.rglob("provider.yaml"):
provider_yaml = yaml.safe_load(provider_path.read_text())
if provider_yaml.get("suspended"):
suspended_providers.append(
