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 0779b2c133f Remove `--use-uv` from `breeze setup config`. (#45407)
0779b2c133f is described below
commit 0779b2c133f08cfdeff7572bd980cd5a83b29d20
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sun Jan 5 16:15:28 2025 +0100
Remove `--use-uv` from `breeze setup config`. (#45407)
While this config worked to setup uv/no-uv, it has never been
really used. Instead in all places where `use-uv` parameter
is used, the option determines the default rather than config
on breeze setup level.
---
.github/actions/breeze/action.yml | 12 -----------
dev/breeze/doc/images/output_setup_config.svg | 24 +++++++++-------------
dev/breeze/doc/images/output_setup_config.txt | 2 +-
.../src/airflow_breeze/commands/setup_commands.py | 18 ----------------
.../commands/setup_commands_config.py | 1 -
5 files changed, 11 insertions(+), 46 deletions(-)
diff --git a/.github/actions/breeze/action.yml
b/.github/actions/breeze/action.yml
index cbb1642b978..0a88f0dc0c2 100644
--- a/.github/actions/breeze/action.yml
+++ b/.github/actions/breeze/action.yml
@@ -58,15 +58,3 @@ runs:
run: breeze setup config --no-cheatsheet --no-asciiart
env:
AIRFLOW_SOURCES_ROOT: "${{ github.workspace }}"
- - name: "Use uv "
- shell: bash
- run: breeze setup config --use-uv
- env:
- AIRFLOW_SOURCES_ROOT: "${{ github.workspace }}"
- if: inputs.use-uv == 'true'
- - name: "Don't use uv "
- shell: bash
- run: breeze setup config --no-use-uv
- env:
- AIRFLOW_SOURCES_ROOT: "${{ github.workspace }}"
- if: inputs.use-uv != 'true'
diff --git a/dev/breeze/doc/images/output_setup_config.svg
b/dev/breeze/doc/images/output_setup_config.svg
index bf074d2f3d4..ae0d37872a1 100644
--- a/dev/breeze/doc/images/output_setup_config.svg
+++ b/dev/breeze/doc/images/output_setup_config.svg
@@ -1,4 +1,4 @@
-<svg class="rich-terminal" viewBox="0 0 1482 635.5999999999999"
xmlns="http://www.w3.org/2000/svg";>
+<svg class="rich-terminal" viewBox="0 0 1482 611.1999999999999"
xmlns="http://www.w3.org/2000/svg";>
<!-- Generated with Rich https://www.textualize.io -->
<style>
@@ -43,7 +43,7 @@
<defs>
<clipPath id="breeze-setup-config-clip-terminal">
- <rect x="0" y="0" width="1463.0" height="584.5999999999999" />
+ <rect x="0" y="0" width="1463.0" height="560.1999999999999" />
</clipPath>
<clipPath id="breeze-setup-config-line-0">
<rect x="0" y="1.5" width="1464" height="24.65"/>
@@ -111,12 +111,9 @@
<clipPath id="breeze-setup-config-line-21">
<rect x="0" y="513.9" width="1464" height="24.65"/>
</clipPath>
-<clipPath id="breeze-setup-config-line-22">
- <rect x="0" y="538.3" 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="633.6" rx="8"/><text
class="breeze-setup-config-title" fill="#c5c8c6" text-anchor="middle" x="740"
y="27">Command: setup config</text>
+ <rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1"
x="1" y="1" width="1480" height="609.2" rx="8"/><text
class="breeze-setup-config-title" fill="#c5c8c6" text-anchor="middle" x="740"
y="27">Command: setup config</text>
<g transform="translate(26,22)">
<circle cx="0" cy="0" r="7" fill="#ff5f57"/>
<circle cx="22" cy="0" r="7" fill="#febc2e"/>
@@ -142,14 +139,13 @@
</text><text class="breeze-setup-config-r5" x="0" y="337.2" textLength="12.2"
clip-path="url(#breeze-setup-config-line-13)">│</text><text
class="breeze-setup-config-r5" x="475.8" y="337.2" textLength="963.8"
clip-path="url(#breeze-setup-config-line-13)">[default: sqlite]                                    
[...]
</text><text class="breeze-setup-config-r5" x="0" y="361.6" textLength="12.2"
clip-path="url(#breeze-setup-config-line-14)">│</text><text
class="breeze-setup-config-r4" x="24.4" y="361.6" textLength="219.6"
clip-path="url(#breeze-setup-config-line-14)">--postgres-version</text><text
class="breeze-setup-config-r6" x="390.4" y="361.6" textLength="24.4"
clip-path="url(#breeze-setup-config-line-14)">-P</text><text
class="breeze-setup-config-r1" x="475.8" y="361.6" textLength="305" clip-path=
[...]
</text><text class="breeze-setup-config-r5" x="0" y="386" textLength="12.2"
clip-path="url(#breeze-setup-config-line-15)">│</text><text
class="breeze-setup-config-r4" x="24.4" y="386" textLength="183"
clip-path="url(#breeze-setup-config-line-15)">--mysql-version</text><text
class="breeze-setup-config-r6" x="390.4" y="386" textLength="24.4"
clip-path="url(#breeze-setup-config-line-15)">-M</text><text
class="breeze-setup-config-r1" x="475.8" y="386" textLength="268.4"
clip-path="url(#breez [...]
-</text><text class="breeze-setup-config-r5" x="0" y="410.4" textLength="12.2"
clip-path="url(#breeze-setup-config-line-16)">│</text><text
class="breeze-setup-config-r4" x="24.4" y="410.4" textLength="97.6"
clip-path="url(#breeze-setup-config-line-16)">--use-uv</text><text
class="breeze-setup-config-r1" x="122" y="410.4" textLength="12.2"
clip-path="url(#breeze-setup-config-line-16)">/</text><text
class="breeze-setup-config-r4" x="134.2" y="410.4" textLength="134.2"
clip-path="url(#breeze [...]
-</text><text class="breeze-setup-config-r5" x="0" y="434.8" textLength="12.2"
clip-path="url(#breeze-setup-config-line-17)">│</text><text
class="breeze-setup-config-r4" x="24.4" y="434.8" textLength="146.4"
clip-path="url(#breeze-setup-config-line-17)">--cheatsheet</text><text
class="breeze-setup-config-r1" x="170.8" y="434.8" textLength="12.2"
clip-path="url(#breeze-setup-config-line-17)">/</text><text
class="breeze-setup-config-r4" x="183" y="434.8" textLength="183"
clip-path="url(#bre [...]
-</text><text class="breeze-setup-config-r5" x="0" y="459.2" textLength="12.2"
clip-path="url(#breeze-setup-config-line-18)">│</text><text
class="breeze-setup-config-r4" x="24.4" y="459.2" textLength="122"
clip-path="url(#breeze-setup-config-line-18)">--asciiart</text><text
class="breeze-setup-config-r1" x="146.4" y="459.2" textLength="12.2"
clip-path="url(#breeze-setup-config-line-18)">/</text><text
class="breeze-setup-config-r4" x="158.6" y="459.2" textLength="158.6"
clip-path="url(#bre [...]
-</text><text class="breeze-setup-config-r5" x="0" y="483.6" textLength="12.2"
clip-path="url(#breeze-setup-config-line-19)">│</text><text
class="breeze-setup-config-r4" x="24.4" y="483.6" textLength="97.6"
clip-path="url(#breeze-setup-config-line-19)">--colour</text><text
class="breeze-setup-config-r1" x="122" y="483.6" textLength="12.2"
clip-path="url(#breeze-setup-config-line-19)">/</text><text
class="breeze-setup-config-r4" x="134.2" y="483.6" textLength="134.2"
clip-path="url(#breeze [...]
-</text><text class="breeze-setup-config-r5" x="0" y="508" textLength="1464"
clip-path="url(#breeze-setup-config-line-20)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text
class="breeze-setup-config-r1" x="1464" y="508" textLength="12.2"
clip-path="url(#breeze-setup-config-line-20)">
-</text><text class="breeze-setup-config-r5" x="0" y="532.4" textLength="24.4"
clip-path="url(#breeze-setup-config-line-21)">╭─</text><text
class="breeze-setup-config-r5" x="24.4" y="532.4" textLength="195.2"
clip-path="url(#breeze-setup-config-line-21)"> Common options </text><text
class="breeze-setup-config-r5" x="219.6" y="532.4" textLength="1220"
clip-path="url(#breeze-setup-config-line-21)">───────────────────────────────────────────────────────────────────────────────
[...]
-</text><text class="breeze-setup-config-r5" x="0" y="556.8" textLength="12.2"
clip-path="url(#breeze-setup-config-line-22)">│</text><text
class="breeze-setup-config-r4" x="24.4" y="556.8" textLength="73.2"
clip-path="url(#breeze-setup-config-line-22)">--help</text><text
class="breeze-setup-config-r6" x="122" y="556.8" textLength="24.4"
clip-path="url(#breeze-setup-config-line-22)">-h</text><text
class="breeze-setup-config-r1" x="170.8" y="556.8" textLength="329.4"
clip-path="url(#breeze- [...]
-</text><text class="breeze-setup-config-r5" x="0" y="581.2" textLength="1464"
clip-path="url(#breeze-setup-config-line-23)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text
class="breeze-setup-config-r1" x="1464" y="581.2" textLength="12.2"
clip-path="url(#breeze-setup-config-line-23)">
+</text><text class="breeze-setup-config-r5" x="0" y="410.4" textLength="12.2"
clip-path="url(#breeze-setup-config-line-16)">│</text><text
class="breeze-setup-config-r4" x="24.4" y="410.4" textLength="146.4"
clip-path="url(#breeze-setup-config-line-16)">--cheatsheet</text><text
class="breeze-setup-config-r1" x="170.8" y="410.4" textLength="12.2"
clip-path="url(#breeze-setup-config-line-16)">/</text><text
class="breeze-setup-config-r4" x="183" y="410.4" textLength="183"
clip-path="url(#bre [...]
+</text><text class="breeze-setup-config-r5" x="0" y="434.8" textLength="12.2"
clip-path="url(#breeze-setup-config-line-17)">│</text><text
class="breeze-setup-config-r4" x="24.4" y="434.8" textLength="122"
clip-path="url(#breeze-setup-config-line-17)">--asciiart</text><text
class="breeze-setup-config-r1" x="146.4" y="434.8" textLength="12.2"
clip-path="url(#breeze-setup-config-line-17)">/</text><text
class="breeze-setup-config-r4" x="158.6" y="434.8" textLength="158.6"
clip-path="url(#bre [...]
+</text><text class="breeze-setup-config-r5" x="0" y="459.2" textLength="12.2"
clip-path="url(#breeze-setup-config-line-18)">│</text><text
class="breeze-setup-config-r4" x="24.4" y="459.2" textLength="97.6"
clip-path="url(#breeze-setup-config-line-18)">--colour</text><text
class="breeze-setup-config-r1" x="122" y="459.2" textLength="12.2"
clip-path="url(#breeze-setup-config-line-18)">/</text><text
class="breeze-setup-config-r4" x="134.2" y="459.2" textLength="134.2"
clip-path="url(#breeze [...]
+</text><text class="breeze-setup-config-r5" x="0" y="483.6" textLength="1464"
clip-path="url(#breeze-setup-config-line-19)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text
class="breeze-setup-config-r1" x="1464" y="483.6" textLength="12.2"
clip-path="url(#breeze-setup-config-line-19)">
+</text><text class="breeze-setup-config-r5" x="0" y="508" textLength="24.4"
clip-path="url(#breeze-setup-config-line-20)">╭─</text><text
class="breeze-setup-config-r5" x="24.4" y="508" textLength="195.2"
clip-path="url(#breeze-setup-config-line-20)"> Common options </text><text
class="breeze-setup-config-r5" x="219.6" y="508" textLength="1220"
clip-path="url(#breeze-setup-config-line-20)">─────────────────────────────────────────────────────────────────────────────────────
[...]
+</text><text class="breeze-setup-config-r5" x="0" y="532.4" textLength="12.2"
clip-path="url(#breeze-setup-config-line-21)">│</text><text
class="breeze-setup-config-r4" x="24.4" y="532.4" textLength="73.2"
clip-path="url(#breeze-setup-config-line-21)">--help</text><text
class="breeze-setup-config-r6" x="122" y="532.4" textLength="24.4"
clip-path="url(#breeze-setup-config-line-21)">-h</text><text
class="breeze-setup-config-r1" x="170.8" y="532.4" textLength="329.4"
clip-path="url(#breeze- [...]
+</text><text class="breeze-setup-config-r5" x="0" y="556.8" textLength="1464"
clip-path="url(#breeze-setup-config-line-22)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text
class="breeze-setup-config-r1" x="1464" y="556.8" textLength="12.2"
clip-path="url(#breeze-setup-config-line-22)">
</text>
</g>
</g>
diff --git a/dev/breeze/doc/images/output_setup_config.txt
b/dev/breeze/doc/images/output_setup_config.txt
index ad1eab9d4ab..3f69ce1d49f 100644
--- a/dev/breeze/doc/images/output_setup_config.txt
+++ b/dev/breeze/doc/images/output_setup_config.txt
@@ -1 +1 @@
-44292b9abca625c3e2710b19e2f9bd74
+9509e3954e5aeb6a991fe5b302701d4d
diff --git a/dev/breeze/src/airflow_breeze/commands/setup_commands.py
b/dev/breeze/src/airflow_breeze/commands/setup_commands.py
index 63f600c4e22..801bae9eaf0 100644
--- a/dev/breeze/src/airflow_breeze/commands/setup_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/setup_commands.py
@@ -193,12 +193,6 @@ def version():
@option_mysql_version
@click.option("-C/-c", "--cheatsheet/--no-cheatsheet", help="Enable/disable
cheatsheet.", default=None)
@click.option("-A/-a", "--asciiart/--no-asciiart", help="Enable/disable
ASCIIart.", default=None)
[email protected](
- "-U/-u",
- "--use-uv/--no-use-uv",
- help="Enable/disable using uv for creating venvs by breeze.",
- default=None,
-)
@click.option(
"--colour/--no-colour",
help="Enable/disable Colour mode (useful for colour blind-friendly
communication).",
@@ -207,7 +201,6 @@ def version():
def change_config(
python: str,
backend: str,
- use_uv: bool,
postgres_version: str,
mysql_version: str,
cheatsheet: bool,
@@ -220,15 +213,6 @@ def change_config(
asciiart_file = "suppress_asciiart"
cheatsheet_file = "suppress_cheatsheet"
colour_file = "suppress_colour"
- use_uv_file = "use_uv"
-
- if use_uv is not None:
- if use_uv:
- touch_cache_file(use_uv_file)
- get_console().print("[info]Enable using uv[/]")
- else:
- delete_cache(use_uv_file)
- get_console().print("[info]Disable using uv[/]")
if asciiart is not None:
if asciiart:
delete_cache(asciiart_file)
@@ -262,8 +246,6 @@ def change_config(
get_console().print()
get_console().print(f"[info]* Python: {python}[/]")
get_console().print(f"[info]* Backend: {backend}[/]")
- get_console().print(f"[info]* Use uv: {get_status(use_uv_file)}[/]")
- get_console().print()
get_console().print(f"[info]* Postgres version: {postgres_version}[/]")
get_console().print(f"[info]* MySQL version: {mysql_version}[/]")
get_console().print()
diff --git a/dev/breeze/src/airflow_breeze/commands/setup_commands_config.py
b/dev/breeze/src/airflow_breeze/commands/setup_commands_config.py
index 802a41fc273..61460f004ec 100644
--- a/dev/breeze/src/airflow_breeze/commands/setup_commands_config.py
+++ b/dev/breeze/src/airflow_breeze/commands/setup_commands_config.py
@@ -63,7 +63,6 @@ SETUP_PARAMETERS: dict[str, list[dict[str, str | list[str]]]]
= {
"--backend",
"--postgres-version",
"--mysql-version",
- "--use-uv",
"--cheatsheet",
"--asciiart",
"--colour",
