This is an automated email from the ASF dual-hosted git repository.
uranusjr 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 8309209ac7 Regenerate breeze help images on commmand option changes
(#32624)
8309209ac7 is described below
commit 8309209ac715b3872ba012901b70d6f04c9ee368
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sat Jul 15 13:15:59 2023 +0200
Regenerate breeze help images on commmand option changes (#32624)
---
.../commands/release_management_commands_config.py | 1 +
.../src/airflow_breeze/commands/setup_commands.py | 8 ++++--
images/breeze/output-commands-hash.txt | 32 +++++++++++-----------
images/breeze/output_release-management.svg | 18 ++++--------
images/breeze/output_sbom.svg | 20 +++++++-------
5 files changed, 38 insertions(+), 41 deletions(-)
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 38196ea48a..6c156283c9 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
@@ -44,6 +44,7 @@ RELEASE_OTHER_COMMANDS: dict[str, str | list[str]] = {
"commands": [
"publish-docs",
"generate-constraints",
+ "add-back-references",
],
}
diff --git a/dev/breeze/src/airflow_breeze/commands/setup_commands.py
b/dev/breeze/src/airflow_breeze/commands/setup_commands.py
index 7c713d9da3..9d6c558449 100644
--- a/dev/breeze/src/airflow_breeze/commands/setup_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/setup_commands.py
@@ -282,6 +282,10 @@ def get_command_hash_export() -> str:
options = rich_click.rich_click.OPTION_GROUPS
for command in sorted(commands_dict.keys()):
current_command_dict = commands_dict[command]
+ current_command_hash_dict = {
+ "command": current_command_dict,
+ "options": rich_click.rich_click.COMMAND_GROUPS.get(f"breeze
{command}"),
+ }
if "commands" in current_command_dict:
subcommands = current_command_dict["commands"]
for subcommand in sorted(subcommands.keys()):
@@ -303,9 +307,9 @@ def get_command_hash_export() -> str:
"rich_click_options": subcommand_rich_click_dict,
}
hashes.append(f"{command}:{subcommand}:{dict_hash(final_dict)}")
- hashes.append(f"{command}:{dict_hash(current_command_dict)}")
+
hashes.append(f"{command}:{dict_hash(current_command_hash_dict)}")
else:
- hashes.append(f"{command}:{dict_hash(current_command_dict)}")
+
hashes.append(f"{command}:{dict_hash(current_command_hash_dict)}")
return "\n".join(hashes) + "\n"
diff --git a/images/breeze/output-commands-hash.txt
b/images/breeze/output-commands-hash.txt
index 17bca23d51..1889686688 100644
--- a/images/breeze/output-commands-hash.txt
+++ b/images/breeze/output-commands-hash.txt
@@ -2,21 +2,21 @@
# Please do not solve it but run `breeze setup regenerate-command-images`.
# This command should fix the conflict and regenerate help images that you
have conflict with.
main:344261ca3aa7ff31e098b1d88280566a
-build-docs:b45888f44f40dfd47bd918ea4ffedbe1
+build-docs:927336a331afdb9f7b6797c119d9cc16
ci:fix-ownership:3e5a73533cc96045e72cb258783cfc96
ci:free-space:49af17b032039c05c41a7a8283f365cc
ci:get-workflow-info:8246038093359b9c3c110043419473e2
ci:resource-check:bfcca92f18a403ca630955074eb5e9ad
ci:selective-check:6657ed5d42affb7264b5efcc86f17a2a
-ci:2f985ab2973ce0bbea558d6fa9111dd1
+ci:65d145d7746bde5f8dc8f6f484cfc134
ci-image:build:a06f3ac7e0110213db25d06e6f5702da
ci-image:pull:7f14482a588f018f76df84719e77723f
ci-image:verify:c90dc7e20fce2351eb89d8d1ebbd35e7
-ci-image:1af2ced25364bf2ce8985a735ae88b0a
-cleanup:231de69d5f47ba29c883164e4575e310
-compile-www-assets:c8a8c4f002f7246d0541897fc7c70313
-down:99efb2055475cd40656d5498aee74ef6
-exec:42bbd3c1659128b0341ae118c3482da2
+ci-image:8b6a9a00849da08e89e8af2b6bd3672c
+cleanup:8d92d453a6700f6d8cb11fb6a8b50461
+compile-www-assets:0963f1409f0aa1e3b137cddd4cc52e87
+down:4580f5b3b178ea00182694f134a751f3
+exec:9d0fb86607526afb6b161115ae7bf9cc
k8s:build-k8s-image:4c299179e91066626e5b4a61b06fd6c6
k8s:configure-cluster:450f6aaa0623bbfd6ce05dfa0bc13156
k8s:create-cluster:dfeb9f49a113fc28e8d4029fae140b96
@@ -30,11 +30,11 @@ k8s:shell:9ee5244d1dc9c625dbd8c87504a6c4ce
k8s:status:1b1b6fb6ccc7a211a3eb44568da71659
k8s:tests:2319c6f5ba0681ff7627e3166a1479ef
k8s:upload-k8s-image:a9ac79e2f5e3d6b01fa45e764885913f
-k8s:c1f106fa973fdd8bc1ccf71a025aa51b
+k8s:db08df55a8200bff5858a3b7549bff47
prod-image:build:58ab53c2f5e799bbe05d6fac26d001bf
prod-image:pull:76f1f27e6119928412abecf153fce4bb
prod-image:verify:bd2b78738a7c388dbad6076c41a9f906
-prod-image:2da480c21d7eb120075489dc1da0f55b
+prod-image:a434391e2b5201aaeb5c06601485f7bc
release-management:add-back-references:8dab6a30076a55f2d31c6d22a94e0ccb
release-management:create-minor-branch:a3834afc4aa5d1e98002c9e9e7a9931d
release-management:generate-constraints:b8fcaf8f0acd35ed5dbd48659bdb6485
@@ -49,22 +49,22 @@
release-management:release-prod-images:4d85a23a2175bf8894de5aedbdd85614
release-management:start-rc-process:b27bd524dd3c89f50a747b60a7e892c1
release-management:start-release:419f48f6a4ff4457cb9de7ff496aebbe
release-management:verify-provider-packages:96dce5644aad6b37080acf77b3d8de3a
-release-management:077bbb9b6bc15e9700735a3e25bfee1a
+release-management:e12492cf058a0c32fc6daecde65a1aef
sbom:generate-provider-requirements:1e7609a0ebafb839d30ec90e4254a628
sbom:update-sbom-information:0ce56884e5f842e3e80d6619df1ccc64
-sbom:d9c57d78e23a29ec9cd0139e230e1811
+sbom:2ac6b8fc1e84428d5588270eb0d84040
setup:autocomplete:fffcd49e102e09ccd69b3841a9e3ea8e
setup:check-all-params-in-groups:76b3b1d3726ca2a446bab0668b1c50f5
setup:config:38ebaaf93ed42bc7b2a3000eeea2631d
setup:regenerate-command-images:9217287065e8d7b64d36bc6a80da1e7a
setup:self-upgrade:4af905a147fcd6670a0e33d3d369a94b
setup:version:be116d90a21c2afe01087f7609774e1e
-setup:3bf520bc5f968107d5022679d7be7c7f
-shell:48db0babd831d704b97118d053ee639a
-start-airflow:52ad9113f74b39c1ffbd37464e1415e6
-static-checks:6ba0614c2c493b45bfc027c3570d737e
+setup:cdf58a9c27af2877dc5a658ed0a1d99c
+shell:87e7bdcebe1180395adfec86b2a065f5
+start-airflow:f7216a8126ecf14b033e2ea677e1a105
+static-checks:bb1248670000271a9e011c12747079c1
testing:docker-compose-tests:e8b18bda81e2fa0d48866805469310dc
testing:helm-tests:8e491da2e01ebd815322c37562059d77
testing:integration-tests:48707c24aa076b70fccf6dbfb18b65a2
testing:tests:e18fbd845ca5783879244bf0f9f9c51e
-testing:38994916f0782b907a8c3e1ede073337
+testing:0d1b776df1e8b3915aa219e0c15a0917
diff --git a/images/breeze/output_release-management.svg
b/images/breeze/output_release-management.svg
index 54715bce84..b9b424c018 100644
--- a/images/breeze/output_release-management.svg
+++ b/images/breeze/output_release-management.svg
@@ -1,4 +1,4 @@
-<svg class="rich-terminal" viewBox="0 0 1482 782.0"
xmlns="http://www.w3.org/2000/svg";>
+<svg class="rich-terminal" viewBox="0 0 1482 733.1999999999999"
xmlns="http://www.w3.org/2000/svg";>
<!-- Generated with Rich https://www.textualize.io -->
<style>
@@ -42,7 +42,7 @@
<defs>
<clipPath id="breeze-release-management-clip-terminal">
- <rect x="0" y="0" width="1463.0" height="731.0" />
+ <rect x="0" y="0" width="1463.0" height="682.1999999999999" />
</clipPath>
<clipPath id="breeze-release-management-line-0">
<rect x="0" y="1.5" width="1464" height="24.65"/>
@@ -125,15 +125,9 @@
<clipPath id="breeze-release-management-line-26">
<rect x="0" y="635.9" width="1464" height="24.65"/>
</clipPath>
-<clipPath id="breeze-release-management-line-27">
- <rect x="0" y="660.3" width="1464" height="24.65"/>
- </clipPath>
-<clipPath id="breeze-release-management-line-28">
- <rect x="0" y="684.7" width="1464" height="24.65"/>
- </clipPath>
</defs>
- <rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1"
x="1" y="1" width="1480" height="780" rx="8"/><text
class="breeze-release-management-title" fill="#c5c8c6" text-anchor="middle"
x="740" y="27">Command: release-management</text>
+ <rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1"
x="1" y="1" width="1480" height="731.2" rx="8"/><text
class="breeze-release-management-title" fill="#c5c8c6" text-anchor="middle"
x="740" y="27">Command: release-management</text>
<g transform="translate(26,22)">
<circle cx="0" cy="0" r="7" fill="#ff5f57"/>
<circle cx="22" cy="0" r="7" fill="#febc2e"/>
@@ -169,10 +163,8 @@
</text><text class="breeze-release-management-r5" x="0" y="581.2"
textLength="24.4"
clip-path="url(#breeze-release-management-line-23)">╭─</text><text
class="breeze-release-management-r5" x="24.4" y="581.2" textLength="292.8"
clip-path="url(#breeze-release-management-line-23)"> Other release commands </text><text
class="breeze-release-management-r5" x="317.2" y="581.2" textLength="1122.4"
clip-path="url(#breeze-release-management-line-23)">────────────────────────────
[...]
</text><text class="breeze-release-management-r5" x="0" y="605.6"
textLength="12.2"
clip-path="url(#breeze-release-management-line-24)">│</text><text
class="breeze-release-management-r4" x="24.4" y="605.6" textLength="292.8"
clip-path="url(#breeze-release-management-line-24)">publish-docs            </text><text
class="breeze-release-management-r2" x="341.6" y="605.6" textLength="1098"
clip-path="url(#breeze-release-management-l [...]
</text><text class="breeze-release-management-r5" x="0" y="630"
textLength="12.2"
clip-path="url(#breeze-release-management-line-25)">│</text><text
class="breeze-release-management-r4" x="24.4" y="630" textLength="292.8"
clip-path="url(#breeze-release-management-line-25)">generate-constraints    </text><text
class="breeze-release-management-r2" x="341.6" y="630" textLength="1098"
clip-path="url(#breeze-release-management-line-25)">Generates pinned constraint
[...]
-</text><text class="breeze-release-management-r5" x="0" y="654.4"
textLength="1464"
clip-path="url(#breeze-release-management-line-26)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text
class="breeze-release-management-r2" x="1464" y="654.4" textLength="12.2"
clip-path="url(#breeze-release-management-line-26)">
-</text><text class="breeze-release-management-r5" x="0" y="678.8"
textLength="24.4"
clip-path="url(#breeze-release-management-line-27)">╭─</text><text
class="breeze-release-management-r5" x="24.4" y="678.8" textLength="122"
clip-path="url(#breeze-release-management-line-27)"> Commands </text><text
class="breeze-release-management-r5" x="146.4" y="678.8" textLength="1293.2"
clip-path="url(#breeze-release-management-line-27)">──────────────────────────────────────────────────────
[...]
-</text><text class="breeze-release-management-r5" x="0" y="703.2"
textLength="12.2"
clip-path="url(#breeze-release-management-line-28)">│</text><text
class="breeze-release-management-r4" x="24.4" y="703.2" textLength="280.6"
clip-path="url(#breeze-release-management-line-28)">add-back-references    </text><text
class="breeze-release-management-r2" x="329.4" y="703.2" textLength="1110.2"
clip-path="url(#breeze-release-management-line-28)">Command to add 
[...]
-</text><text class="breeze-release-management-r5" x="0" y="727.6"
textLength="1464"
clip-path="url(#breeze-release-management-line-29)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text
class="breeze-release-management-r2" x="1464" y="727.6" textLength="12.2"
clip-path="url(#breeze-release-management-line-29)">
+</text><text class="breeze-release-management-r5" x="0" y="654.4"
textLength="12.2"
clip-path="url(#breeze-release-management-line-26)">│</text><text
class="breeze-release-management-r4" x="24.4" y="654.4" textLength="292.8"
clip-path="url(#breeze-release-management-line-26)">add-back-references     </text><text
class="breeze-release-management-r2" x="341.6" y="654.4" textLength="1098"
clip-path="url(#breeze-release-management-line-26)">Command to add&#
[...]
+</text><text class="breeze-release-management-r5" x="0" y="678.8"
textLength="1464"
clip-path="url(#breeze-release-management-line-27)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text
class="breeze-release-management-r2" x="1464" y="678.8" textLength="12.2"
clip-path="url(#breeze-release-management-line-27)">
</text>
</g>
</g>
diff --git a/images/breeze/output_sbom.svg b/images/breeze/output_sbom.svg
index 0f42e678c1..205f0fa242 100644
--- a/images/breeze/output_sbom.svg
+++ b/images/breeze/output_sbom.svg
@@ -35,8 +35,8 @@
.breeze-sbom-r1 { fill: #c5c8c6;font-weight: bold }
.breeze-sbom-r2 { fill: #c5c8c6 }
.breeze-sbom-r3 { fill: #d0b344;font-weight: bold }
-.breeze-sbom-r4 { fill: #868887 }
-.breeze-sbom-r5 { fill: #68a0b3;font-weight: bold }
+.breeze-sbom-r4 { fill: #68a0b3;font-weight: bold }
+.breeze-sbom-r5 { fill: #868887 }
.breeze-sbom-r6 { fill: #98a84b;font-weight: bold }
</style>
@@ -90,17 +90,17 @@
<g class="breeze-sbom-matrix">
<text class="breeze-sbom-r2" x="1464" y="20" textLength="12.2"
clip-path="url(#breeze-sbom-line-0)">
-</text><text class="breeze-sbom-r3" x="12.2" y="44.4" textLength="85.4"
clip-path="url(#breeze-sbom-line-1)">Usage: </text><text
class="breeze-sbom-r1" x="97.6" y="44.4" textLength="475.8"
clip-path="url(#breeze-sbom-line-1)">breeze sbom [OPTIONS] COMMAND [ARGS]...</text><text
class="breeze-sbom-r2" x="1464" y="44.4" textLength="12.2"
clip-path="url(#breeze-sbom-line-1)">
+</text><text class="breeze-sbom-r3" x="12.2" y="44.4" textLength="85.4"
clip-path="url(#breeze-sbom-line-1)">Usage: </text><text
class="breeze-sbom-r1" x="97.6" y="44.4" textLength="158.6"
clip-path="url(#breeze-sbom-line-1)">breeze sbom [</text><text
class="breeze-sbom-r4" x="256.2" y="44.4" textLength="85.4"
clip-path="url(#breeze-sbom-line-1)">OPTIONS</text><text class="breeze-sbom-r1"
x="341.6" y="44.4" textLength="24.4"
clip-path="url(#breeze-sbom-line-1)">] </te [...]
</text><text class="breeze-sbom-r2" x="1464" y="68.8" textLength="12.2"
clip-path="url(#breeze-sbom-line-2)">
</text><text class="breeze-sbom-r2" x="12.2" y="93.2" textLength="768.6"
clip-path="url(#breeze-sbom-line-3)">Tools that release managers can use to prepare sbom information</text><text
class="breeze-sbom-r2" x="1464" y="93.2" textLength="12.2"
clip-path="url(#breeze-sbom-line-3)">
</text><text class="breeze-sbom-r2" x="1464" y="117.6" textLength="12.2"
clip-path="url(#breeze-sbom-line-4)">
-</text><text class="breeze-sbom-r4" x="0" y="142" textLength="24.4"
clip-path="url(#breeze-sbom-line-5)">╭─</text><text class="breeze-sbom-r4"
x="24.4" y="142" textLength="195.2"
clip-path="url(#breeze-sbom-line-5)"> Common options </text><text
class="breeze-sbom-r4" x="219.6" y="142" textLength="1220"
clip-path="url(#breeze-sbom-line-5)">────────────────────────────────────────────────────────────────────────────────────────────────────</text><text
class="breeze-sbom-r4" [...]
-</text><text class="breeze-sbom-r4" x="0" y="166.4" textLength="12.2"
clip-path="url(#breeze-sbom-line-6)">│</text><text class="breeze-sbom-r5"
x="24.4" y="166.4" textLength="12.2"
clip-path="url(#breeze-sbom-line-6)">-</text><text class="breeze-sbom-r5"
x="36.6" y="166.4" textLength="61"
clip-path="url(#breeze-sbom-line-6)">-help</text><text class="breeze-sbom-r6"
x="122" y="166.4" textLength="24.4"
clip-path="url(#breeze-sbom-line-6)">-h</text><text class="breeze-sbom-r2"
x="170.8" y=" [...]
-</text><text class="breeze-sbom-r4" x="0" y="190.8" textLength="1464"
clip-path="url(#breeze-sbom-line-7)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text
class="breeze-sbom-r2" x="1464" y="190.8" textLength="12.2"
clip-path="url(#breeze-sbom-line-7)">
-</text><text class="breeze-sbom-r4" x="0" y="215.2" textLength="24.4"
clip-path="url(#breeze-sbom-line-8)">╭─</text><text class="breeze-sbom-r4"
x="24.4" y="215.2" textLength="183"
clip-path="url(#breeze-sbom-line-8)"> SBOM commands </text><text
class="breeze-sbom-r4" x="207.4" y="215.2" textLength="1232.2"
clip-path="url(#breeze-sbom-line-8)">─────────────────────────────────────────────────────────────────────────────────────────────────────</text><text
class="breeze-sbo [...]
-</text><text class="breeze-sbom-r4" x="0" y="239.6" textLength="12.2"
clip-path="url(#breeze-sbom-line-9)">│</text><text class="breeze-sbom-r5"
x="24.4" y="239.6" textLength="536.8"
clip-path="url(#breeze-sbom-line-9)">update-sbom-information                     </text><text
class="breeze-sbom-r2" x="585.6" y="239.6" textLength="854"
clip-path="url(#breeze-sbom-line-9)">Update SB [...]
-</text><text class="breeze-sbom-r4" x="0" y="264" textLength="12.2"
clip-path="url(#breeze-sbom-line-10)">│</text><text class="breeze-sbom-r5"
x="24.4" y="264" textLength="536.8"
clip-path="url(#breeze-sbom-line-10)">generate-provider-requirements              </text><text
class="breeze-sbom-r2" x="585.6" y="264" textLength="854"
clip-path="url(#breeze-sbom-line-10)">Generate requirements for selected
[...]
-</text><text class="breeze-sbom-r4" x="0" y="288.4" textLength="1464"
clip-path="url(#breeze-sbom-line-11)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text
class="breeze-sbom-r2" x="1464" y="288.4" textLength="12.2"
clip-path="url(#breeze-sbom-line-11)">
+</text><text class="breeze-sbom-r5" x="0" y="142" textLength="24.4"
clip-path="url(#breeze-sbom-line-5)">╭─</text><text class="breeze-sbom-r5"
x="24.4" y="142" textLength="195.2"
clip-path="url(#breeze-sbom-line-5)"> Common options </text><text
class="breeze-sbom-r5" x="219.6" y="142" textLength="1220"
clip-path="url(#breeze-sbom-line-5)">────────────────────────────────────────────────────────────────────────────────────────────────────</text><text
class="breeze-sbom-r5" [...]
+</text><text class="breeze-sbom-r5" x="0" y="166.4" textLength="12.2"
clip-path="url(#breeze-sbom-line-6)">│</text><text class="breeze-sbom-r4"
x="24.4" y="166.4" textLength="12.2"
clip-path="url(#breeze-sbom-line-6)">-</text><text class="breeze-sbom-r4"
x="36.6" y="166.4" textLength="61"
clip-path="url(#breeze-sbom-line-6)">-help</text><text class="breeze-sbom-r6"
x="122" y="166.4" textLength="24.4"
clip-path="url(#breeze-sbom-line-6)">-h</text><text class="breeze-sbom-r2"
x="170.8" y=" [...]
+</text><text class="breeze-sbom-r5" x="0" y="190.8" textLength="1464"
clip-path="url(#breeze-sbom-line-7)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text
class="breeze-sbom-r2" x="1464" y="190.8" textLength="12.2"
clip-path="url(#breeze-sbom-line-7)">
+</text><text class="breeze-sbom-r5" x="0" y="215.2" textLength="24.4"
clip-path="url(#breeze-sbom-line-8)">╭─</text><text class="breeze-sbom-r5"
x="24.4" y="215.2" textLength="183"
clip-path="url(#breeze-sbom-line-8)"> SBOM commands </text><text
class="breeze-sbom-r5" x="207.4" y="215.2" textLength="1232.2"
clip-path="url(#breeze-sbom-line-8)">─────────────────────────────────────────────────────────────────────────────────────────────────────</text><text
class="breeze-sbo [...]
+</text><text class="breeze-sbom-r5" x="0" y="239.6" textLength="12.2"
clip-path="url(#breeze-sbom-line-9)">│</text><text class="breeze-sbom-r4"
x="24.4" y="239.6" textLength="536.8"
clip-path="url(#breeze-sbom-line-9)">update-sbom-information                     </text><text
class="breeze-sbom-r2" x="585.6" y="239.6" textLength="85.4"
clip-path="url(#breeze-sbom-line-9)">Update < [...]
+</text><text class="breeze-sbom-r5" x="0" y="264" textLength="12.2"
clip-path="url(#breeze-sbom-line-10)">│</text><text class="breeze-sbom-r4"
x="24.4" y="264" textLength="536.8"
clip-path="url(#breeze-sbom-line-10)">generate-provider-requirements              </text><text
class="breeze-sbom-r2" x="585.6" y="264" textLength="854"
clip-path="url(#breeze-sbom-line-10)">Generate requirements for selected
[...]
+</text><text class="breeze-sbom-r5" x="0" y="288.4" textLength="1464"
clip-path="url(#breeze-sbom-line-11)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text
class="breeze-sbom-r2" x="1464" y="288.4" textLength="12.2"
clip-path="url(#breeze-sbom-line-11)">
</text>
</g>
</g>
