diff --git a/dev/README_RELEASE_AIRFLOW.md b/dev/README_RELEASE_AIRFLOW.md index e64b11af80bda..a56177b937c39 100644 --- a/dev/README_RELEASE_AIRFLOW.md +++ b/dev/README_RELEASE_AIRFLOW.md @@ -373,8 +373,7 @@ uv tool install -e ./dev/breeze - Generate the body of the issue using the below command: ```shell script - breeze release-management generate-issue-content-core --previous-release - --current-release ${VERSION} + breeze release-management generate-issue-content-core --previous-release --current-release ${VERSION} ``` ## Publish release candidate documentation (staging) diff --git a/dev/breeze/doc/images/output-commands.svg b/dev/breeze/doc/images/output-commands.svg index 234bfa5ee81a3..c82c8759006e7 100644 --- a/dev/breeze/doc/images/output-commands.svg +++ b/dev/breeze/doc/images/output-commands.svg @@ -329,8 +329,8 @@ │gremlin | kafka | kerberos | keycloak | mongo | mssql |│ │openlineage | otel | pinot | qdrant | redis | statsd | │ │trino | ydb)                                           │ -│--standalone-dag-processor/--no-standalone-dag-processoRun standalone dag processor for start-airflow         │ -│r(required for Airflow 3).                              │ +│--standalone-dag-processor/--no-standalone-dag-process…Run standalone dag processor for start-airflow         │ +│(required for Airflow 3).                              │ │[default: standalone-dag-processor]                    │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭─ Docker Compose selection and cleanup ───────────────────────────────────────────────────────────────────────────────╮ diff --git a/dev/breeze/doc/images/output_release-management_generate-issue-content-core.svg b/dev/breeze/doc/images/output_release-management_generate-issue-content-core.svg index 4cef9035b119a..68a1adb591985 100644 --- a/dev/breeze/doc/images/output_release-management_generate-issue-content-core.svg +++ b/dev/breeze/doc/images/output_release-management_generate-issue-content-core.svg @@ -1,4 +1,4 @@ - + - + @@ -99,12 +101,9 @@ - - - - Command: release-management generate-issue-content-core + Command: release-management generate-issue-content-core @@ -120,20 +119,19 @@ Generates content for issue to test the core release. ╭─ Generate issue flags ───────────────────────────────────────────────────────────────────────────────────────────────╮ -│--github-tokenGitHub token used to authenticate. You can set omit it if you have GITHUB_TOKEN env variable  │ -│set. Can be generated with:                                                                   │ -│https://github.com/settings/tokens/new?description=Read%20sssues&scopes=repo:status           │ -│(TEXT)                                                                                        │ -│--previous-releasecommit reference (for example hash or tag) of the previous release.(TEXT)│ -│--current-releasecommit reference (for example hash or tag) of the current release.(TEXT)│ -│--excluded-pr-listComa-separated list of PRs to exclude from the issue.(TEXT)│ -│--limit-pr-countLimit PR count processes (useful for testing small subset of PRs).(INTEGER)│ -│--latestRun the command against latest released version of airflow│ -╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ -╭─ Common options ─────────────────────────────────────────────────────────────────────────────────────────────────────╮ -│--verbose-vPrint verbose information about performed steps.│ -│--help-hShow this message and exit.│ -╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ +│--github-tokenGitHub token used to authenticate. You can set omit it if you have GITHUB_TOKEN env        │ +│variable set. Can be generated with:                                                       │ +│https://github.com/settings/tokens/new?description=Read%20sssues&scopes=repo:status        │ +│(TEXT)                                                                                     │ +│*--previous-releasecommit reference (for example hash or tag) of the previous release.(TEXT)[required]│ +│*--current-releasecommit reference (for example hash or tag) of the current release.(TEXT)[required]│ +│--excluded-pr-listComa-separated list of PRs to exclude from the issue.(TEXT)│ +│--limit-pr-countLimit PR count processes (useful for testing small subset of PRs).(INTEGER)│ +╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭─ Common options ─────────────────────────────────────────────────────────────────────────────────────────────────────╮ +│--verbose-vPrint verbose information about performed steps.│ +│--help-hShow this message and exit.│ +╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ diff --git a/dev/breeze/doc/images/output_release-management_generate-issue-content-core.txt b/dev/breeze/doc/images/output_release-management_generate-issue-content-core.txt index b35e23d09d408..ff9db17bc0776 100644 --- a/dev/breeze/doc/images/output_release-management_generate-issue-content-core.txt +++ b/dev/breeze/doc/images/output_release-management_generate-issue-content-core.txt @@ -1 +1 @@ -00382e6b2a84a1edbf77eb5ed0a9df72 +4392efab41586255c9af6b05b028399a diff --git a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py index a22d77912331b..47830d1cbcad1 100644 --- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py @@ -174,7 +174,6 @@ ) from airflow_breeze.utils.shared_options import get_dry_run, get_verbose from airflow_breeze.utils.version_utils import ( - get_latest_airflow_version, is_local_package_version, ) from airflow_breeze.utils.versions import is_pre_release @@ -2727,11 +2726,13 @@ def generate_issue_content_helm_chart( "--previous-release", type=str, help="commit reference (for example hash or tag) of the previous release.", + required=True, ) @click.option( "--current-release", type=str, help="commit reference (for example hash or tag) of the current release.", + required=True, ) @click.option("--excluded-pr-list", type=str, help="Coma-separated list of PRs to exclude from the issue.") @click.option( @@ -2740,11 +2741,6 @@ def generate_issue_content_helm_chart( default=None, help="Limit PR count processes (useful for testing small subset of PRs).", ) -@click.option( - "--latest", - is_flag=True, - help="Run the command against latest released version of airflow", -) @option_verbose def generate_issue_content_core( github_token: str, @@ -2752,7 +2748,6 @@ def generate_issue_content_core( current_release: str, excluded_pr_list: str, limit_pr_count: int | None, - latest: bool, ): generate_issue_content( github_token, @@ -2761,7 +2756,6 @@ def generate_issue_content_core( excluded_pr_list, limit_pr_count, is_helm_chart=False, - latest=latest, ) @@ -3753,7 +3747,6 @@ def generate_issue_content( excluded_pr_list: str, limit_pr_count: int | None, is_helm_chart: bool, - latest: bool = False, ): from github import Github, Issue, PullRequest, UnknownObjectException @@ -3763,15 +3756,6 @@ def generate_issue_content( previous = previous_release current = current_release - if latest: - latest_airflow_version = get_latest_airflow_version() - previous = str(latest_airflow_version) - current = os.getenv("VERSION", "HEAD") - if current == "HEAD": - get_console().print( - "\n[warning]Environment variable VERSION not set, setting current release version as 'HEAD'\n" - ) - changes = get_changes(verbose, previous, current, is_helm_chart) change_prs = [change.pr for change in changes] if excluded_pr_list: diff --git a/dev/breeze/src/airflow_breeze/commands/release_management_commands_config.py b/dev/breeze/src/airflow_breeze/commands/release_management_commands_config.py index ad9c275a40a83..d27c61835f3fd 100644 --- a/dev/breeze/src/airflow_breeze/commands/release_management_commands_config.py +++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands_config.py @@ -350,7 +350,6 @@ "--current-release", "--excluded-pr-list", "--limit-pr-count", - "--latest", ], } ], diff --git a/dev/breeze/src/airflow_breeze/utils/version_utils.py b/dev/breeze/src/airflow_breeze/utils/version_utils.py index eabee9a4b44ef..d6e290097838f 100644 --- a/dev/breeze/src/airflow_breeze/utils/version_utils.py +++ b/dev/breeze/src/airflow_breeze/utils/version_utils.py @@ -17,28 +17,6 @@ from __future__ import annotations -def get_latest_helm_chart_version(): - import requests - - response = requests.get("https://airflow.apache.org/_gen/packages-metadata.json") - data = response.json() - for package in data: - if package["package-name"] == "helm-chart": - stable_version = package["stable-version"] - return stable_version - - -def get_latest_airflow_version(): - import requests - - response = requests.get( - "https://pypi.org/pypi/apache-airflow/json", headers={"User-Agent": "Python requests"} - ) - response.raise_for_status() - latest_released_version = response.json()["info"]["version"] - return latest_released_version - - def remove_local_version_suffix(version_suffix: str) -> str: if "+" in version_suffix: return version_suffix.split("+")[0]