Skip to content

Commit 89b3f24

Browse files
potiukephraimbuddy
authored andcommitted
Fix bugs introduced when moving the code of issue generation to breeze (#28683)
The #28352 introduced subtle bugs which failed when runnint it during provider generation. Also added running the command automatically in CI. (cherry picked from commit 69ab7d8)
1 parent e3bfd44 commit 89b3f24

File tree

5 files changed

+60
-54
lines changed

5 files changed

+60
-54
lines changed

dev/breeze/src/airflow_breeze/commands/release_management_commands.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -781,13 +781,15 @@ def get_prs_for_package(package_id: str) -> list[int]:
781781
help="Only consider package ids with packages prepared in the dist folder",
782782
)
783783
@click.option("--excluded-pr-list", type=str, help="Coma-separated list of PRs to exclude from the issue.")
784+
@click.option("--disable-progress", is_flag=True, help="Disable progress bar")
784785
@argument_packages
785786
def generate_issue_content_providers(
786787
packages: list[str],
787788
github_token: str,
788789
suffix: str,
789790
only_available_in_dist: bool,
790791
excluded_pr_list: str,
792+
disable_progress: bool,
791793
):
792794
import jinja2
793795
import yaml
@@ -812,14 +814,14 @@ class ProviderPRInfo(NamedTuple):
812814
all_prs: set[int] = set()
813815
provider_prs: dict[str, list[int]] = {}
814816
if only_available_in_dist:
815-
files_in_dist = os.listdir(str(APACHE_AIRFLOW_GITHUB_REPOSITORY / "dist"))
817+
files_in_dist = os.listdir(str(AIRFLOW_SOURCES_ROOT / "dist"))
816818
prepared_package_ids = []
817819
for package_id in packages:
818820
if not only_available_in_dist or is_package_in_dist(files_in_dist, package_id):
819821
get_console().print(f"Extracting PRs for provider {package_id}")
820822
prepared_package_ids.append(package_id)
821823
else:
822-
get_console.print(
824+
get_console().print(
823825
f"Skipping extracting PRs for provider {package_id} as it is missing in dist"
824826
)
825827
continue
@@ -829,7 +831,7 @@ class ProviderPRInfo(NamedTuple):
829831
g = Github(github_token)
830832
repo = g.get_repo("apache/airflow")
831833
pull_requests: dict[int, PullRequest.PullRequest | Issue.Issue] = {}
832-
with Progress(console=get_console()) as progress:
834+
with Progress(console=get_console(), disable=disable_progress) as progress:
833835
task = progress.add_task(f"Retrieving {len(all_prs)} PRs ", total=len(all_prs))
834836
pr_list = list(all_prs)
835837
for i in range(len(pr_list)):

images/breeze/output-commands-hash.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ prod-image:verify:31bc5efada1d70a0a31990025db1a093
3737
prod-image:a4013428dc7f71a1defc3778d2efe3dc
3838
release-management:create-minor-branch:6a01066dce15e09fb269a8385626657c
3939
release-management:generate-constraints:ae30d6ad49a1b2c15b61cb29080fd957
40-
release-management:generate-issue-content-providers:6e7287bf4933341ce2dfb36f1418cda2
40+
release-management:generate-issue-content-providers:185d92ad2b12ce8628c02e4c0cbbc416
4141
release-management:prepare-airflow-package:3ac14ea6d2b09614959c0ec4fd564789
4242
release-management:prepare-provider-documentation:3fe5ead9887c518d1b397d1103dc0025
4343
release-management:prepare-provider-packages:40144cb01afc56f6a4f92d9e117e546e
4444
release-management:release-prod-images:c9bc40938e0efad49e51ef66e83f9527
4545
release-management:start-rc-process:6aafbaceabd7b67b9a1af4c2f59abc4c
4646
release-management:start-release:acb384d86e02ff5fde1bf971897be17c
4747
release-management:verify-provider-packages:8d3c6362657d76bb3cd064fed5596e84
48-
release-management:c37c732dc8c5d454aedc6cf3bd20bdf0
48+
release-management:339e2dd239185af1df5d73d116aebde5
4949
setup:autocomplete:03343478bf1d0cf9c101d454cdb63b68
5050
setup:check-all-params-in-groups:4d0f8c19cbdb56290055d863b08a3376
5151
setup:config:3ffcd35dd24b486ddf1d08b797e3d017

0 commit comments

Comments
 (0)