This is an automated email from the ASF dual-hosted git repository.
ephraimanierobi pushed a commit to branch v2-8-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 38afe9ffb1e723528ebaa3f005f880aeadd8e926
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Mon Nov 20 22:38:35 2023 +0100
Rename --aditional-extras flag to --aditional-airflow-extras (#35760)
The previous flag was wrongly named so it was converted to
ADDITIONAL_EXTRAS ARG rather than ADDITIONA_AIRFLOW_EXTRAS.
---
BREEZE.rst | 2 +-
IMAGES.rst | 10 +++++-----
.../src/airflow_breeze/commands/ci_image_commands_config.py | 2 +-
.../commands/production_image_commands_config.py | 2 +-
dev/breeze/src/airflow_breeze/params/build_ci_params.py | 4 ++--
dev/breeze/src/airflow_breeze/params/build_prod_params.py | 2 +-
dev/breeze/src/airflow_breeze/params/common_build_params.py | 2 +-
dev/breeze/src/airflow_breeze/utils/common_options.py | 2 +-
images/breeze/output_ci-image_build.svg | 2 +-
images/breeze/output_ci-image_build.txt | 2 +-
images/breeze/output_prod-image_build.svg | 2 +-
images/breeze/output_prod-image_build.txt | 2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/BREEZE.rst b/BREEZE.rst
index 04eecace44..d5bd3c73a8 100644
--- a/BREEZE.rst
+++ b/BREEZE.rst
@@ -1626,7 +1626,7 @@ but here typical examples are presented:
.. code-block:: bash
- breeze prod-image build --additional-extras "jira"
+ breeze prod-image build --additional-airflow-extras "jira"
This installs additional ``jira`` extra while installing airflow in the image.
diff --git a/IMAGES.rst b/IMAGES.rst
index 240952a0e3..7c69d58e70 100644
--- a/IMAGES.rst
+++ b/IMAGES.rst
@@ -97,7 +97,7 @@ By adding ``--python <PYTHON_MAJOR_MINOR_VERSION>`` parameter
you can build the
image version for the chosen Python version.
The images are built with default extras - different extras for CI and
production image and you
-can change the extras via the ``--extras`` parameters and add new ones with
``--additional-extras``.
+can change the extras via the ``--extras`` parameters and add new ones with
``--additional-airflow-extras``.
For example if you want to build Python 3.8 version of production image with
"all" extras installed you should run this command:
@@ -110,7 +110,7 @@ If you just want to add new extras you can add them like
that:
.. code-block:: bash
- breeze prod-image build --python 3.8 --additional-extras "all"
+ breeze prod-image build --python 3.8 --additional-airflow-extras "all"
The command that builds the CI image is optimized to minimize the time needed
to rebuild the image when
the source code of Airflow evolves. This means that if you already have the
image locally downloaded and
@@ -128,7 +128,7 @@ parameter to Breeze:
.. code-block:: bash
- breeze prod-image build --python 3.8 --additional-extras=trino
--install-airflow-version=2.0.0
+ breeze prod-image build --python 3.8 --additional-airflow-extras=trino
--install-airflow-version=2.0.0
This will build the image using command similar to:
@@ -170,7 +170,7 @@ You can also skip installing airflow and install it from
locally provided files
.. code-block:: bash
- breeze prod-image build --python 3.8 --additional-extras=trino
--install-packages-from-context
+ breeze prod-image build --python 3.8 --additional-airflow-extras=trino
--install-packages-from-context
In this case you airflow and all packages (.whl files) should be placed in
``docker-context-files`` folder.
@@ -331,7 +331,7 @@ the same image can be built using ``breeze`` (it supports
auto-completion of the
.. code-block:: bash
- breeze ci-image build --python 3.8 --additional-extras=jdbc
--additional-python-deps="pandas" \
+ breeze ci-image build --python 3.8 --additional-airflow-extras=jdbc
--additional-python-deps="pandas" \
--additional-dev-apt-deps="gcc g++"
You can customize more aspects of the image - such as additional commands
executed before apt dependencies
diff --git a/dev/breeze/src/airflow_breeze/commands/ci_image_commands_config.py
b/dev/breeze/src/airflow_breeze/commands/ci_image_commands_config.py
index f256406ea4..87e6ab6e91 100644
--- a/dev/breeze/src/airflow_breeze/commands/ci_image_commands_config.py
+++ b/dev/breeze/src/airflow_breeze/commands/ci_image_commands_config.py
@@ -60,7 +60,7 @@ CI_IMAGE_TOOLS_PARAMETERS: dict[str, list[dict[str, str |
list[str]]]] = {
"--airflow-constraints-reference",
"--python-image",
"--additional-python-deps",
- "--additional-extras",
+ "--additional-airflow-extras",
"--additional-pip-install-flags",
"--additional-dev-apt-deps",
"--additional-dev-apt-env",
diff --git
a/dev/breeze/src/airflow_breeze/commands/production_image_commands_config.py
b/dev/breeze/src/airflow_breeze/commands/production_image_commands_config.py
index 0f55650b88..713bd0bfa4 100644
--- a/dev/breeze/src/airflow_breeze/commands/production_image_commands_config.py
+++ b/dev/breeze/src/airflow_breeze/commands/production_image_commands_config.py
@@ -57,7 +57,7 @@ PRODUCTION_IMAGE_TOOLS_PARAMETERS: dict[str, list[dict[str,
str | list[str]]]] =
"--airflow-constraints-mode",
"--airflow-constraints-reference",
"--python-image",
- "--additional-extras",
+ "--additional-airflow-extras",
"--additional-pip-install-flags",
"--additional-python-deps",
"--additional-runtime-apt-deps",
diff --git a/dev/breeze/src/airflow_breeze/params/build_ci_params.py
b/dev/breeze/src/airflow_breeze/params/build_ci_params.py
index c216d4c3c6..a713c280b5 100644
--- a/dev/breeze/src/airflow_breeze/params/build_ci_params.py
+++ b/dev/breeze/src/airflow_breeze/params/build_ci_params.py
@@ -94,7 +94,7 @@ class BuildCiParams(CommonBuildParams):
@property
def optional_image_args(self) -> list[str]:
return [
- "additional_extras",
+ "additional_airflow_extras",
"additional_dev_apt_command",
"additional_dev_apt_deps",
"additional_dev_apt_env",
@@ -108,7 +108,7 @@ class BuildCiParams(CommonBuildParams):
"additional_dev_apt_command",
"additional_dev_apt_deps",
"additional_dev_apt_env",
- "additional_extras",
+ "additional_airflow_extras",
"additional_pip_install_flags",
"additional_python_deps",
"version_suffix_for_pypi",
diff --git a/dev/breeze/src/airflow_breeze/params/build_prod_params.py
b/dev/breeze/src/airflow_breeze/params/build_prod_params.py
index 2ba5d3787c..585c7dc0c9 100644
--- a/dev/breeze/src/airflow_breeze/params/build_prod_params.py
+++ b/dev/breeze/src/airflow_breeze/params/build_prod_params.py
@@ -226,7 +226,7 @@ class BuildProdParams(CommonBuildParams):
@property
def optional_image_args(self) -> list[str]:
return [
- "additional_extras",
+ "additional_airflow_extras",
"additional_dev_apt_command",
"additional_dev_apt_deps",
"additional_dev_apt_env",
diff --git a/dev/breeze/src/airflow_breeze/params/common_build_params.py
b/dev/breeze/src/airflow_breeze/params/common_build_params.py
index 798e335e28..782d01bca4 100644
--- a/dev/breeze/src/airflow_breeze/params/common_build_params.py
+++ b/dev/breeze/src/airflow_breeze/params/common_build_params.py
@@ -37,7 +37,7 @@ class CommonBuildParams:
Common build parameters. Those parameters are common parameters for CI And
PROD build.
"""
- additional_extras: str = ""
+ additional_airflow_extras: str = ""
additional_dev_apt_command: str = ""
additional_dev_apt_deps: str = ""
additional_dev_apt_env: str = ""
diff --git a/dev/breeze/src/airflow_breeze/utils/common_options.py
b/dev/breeze/src/airflow_breeze/utils/common_options.py
index 337f5cd2c5..2a001f2757 100644
--- a/dev/breeze/src/airflow_breeze/utils/common_options.py
+++ b/dev/breeze/src/airflow_breeze/utils/common_options.py
@@ -294,7 +294,7 @@ option_upgrade_on_failure = click.option(
envvar="UPGRADE_ON_FAILURE",
)
option_additional_extras = click.option(
- "--additional-extras",
+ "--additional-airflow-extras",
help="Additional extra package while installing Airflow in the image.",
envvar="ADDITIONAL_AIRFLOW_EXTRAS",
)
diff --git a/images/breeze/output_ci-image_build.svg
b/images/breeze/output_ci-image_build.svg
index 98f7dbb901..2a7147c2fd 100644
--- a/images/breeze/output_ci-image_build.svg
+++ b/images/breeze/output_ci-image_build.svg
@@ -364,7 +364,7 @@
</text><text class="breeze-ci-image-build-r5" x="0" y="1142.4"
textLength="12.2" clip-path="url(#breeze-ci-image-build-line-46)">│</text><text
class="breeze-ci-image-build-r1" x="463.6" y="1142.4" textLength="976"
clip-path="url(#breeze-ci-image-build-line-46)">something like: python:VERSION-slim-bookworm.                             &
[...]
</text><text class="breeze-ci-image-build-r5" x="0" y="1166.8"
textLength="12.2" clip-path="url(#breeze-ci-image-build-line-47)">│</text><text
class="breeze-ci-image-build-r7" x="463.6" y="1166.8" textLength="976"
clip-path="url(#breeze-ci-image-build-line-47)">(TEXT)                                     &#
[...]
</text><text class="breeze-ci-image-build-r5" x="0" y="1191.2"
textLength="12.2" clip-path="url(#breeze-ci-image-build-line-48)">│</text><text
class="breeze-ci-image-build-r4" x="24.4" y="1191.2" textLength="12.2"
clip-path="url(#breeze-ci-image-build-line-48)">-</text><text
class="breeze-ci-image-build-r4" x="36.6" y="1191.2" textLength="134.2"
clip-path="url(#breeze-ci-image-build-line-48)">-additional</text><text
class="breeze-ci-image-build-r4" x="170.8" y="1191.2" textLength="146.4" [...]
-</text><text class="breeze-ci-image-build-r5" x="0" y="1215.6"
textLength="12.2" clip-path="url(#breeze-ci-image-build-line-49)">│</text><text
class="breeze-ci-image-build-r4" x="24.4" y="1215.6" textLength="12.2"
clip-path="url(#breeze-ci-image-build-line-49)">-</text><text
class="breeze-ci-image-build-r4" x="36.6" y="1215.6" textLength="134.2"
clip-path="url(#breeze-ci-image-build-line-49)">-additional</text><text
class="breeze-ci-image-build-r4" x="170.8" y="1215.6" textLength="85.4" [...]
+</text><text class="breeze-ci-image-build-r5" x="0" y="1215.6"
textLength="12.2" clip-path="url(#breeze-ci-image-build-line-49)">│</text><text
class="breeze-ci-image-build-r4" x="24.4" y="1215.6" textLength="12.2"
clip-path="url(#breeze-ci-image-build-line-49)">-</text><text
class="breeze-ci-image-build-r4" x="36.6" y="1215.6" textLength="134.2"
clip-path="url(#breeze-ci-image-build-line-49)">-additional</text><text
class="breeze-ci-image-build-r4" x="170.8" y="1215.6" textLength="183" c [...]
</text><text class="breeze-ci-image-build-r5" x="0" y="1240" textLength="12.2"
clip-path="url(#breeze-ci-image-build-line-50)">│</text><text
class="breeze-ci-image-build-r4" x="24.4" y="1240" textLength="12.2"
clip-path="url(#breeze-ci-image-build-line-50)">-</text><text
class="breeze-ci-image-build-r4" x="36.6" y="1240" textLength="134.2"
clip-path="url(#breeze-ci-image-build-line-50)">-additional</text><text
class="breeze-ci-image-build-r4" x="170.8" y="1240" textLength="219.6" clip-pa
[...]
</text><text class="breeze-ci-image-build-r5" x="0" y="1264.4"
textLength="12.2" clip-path="url(#breeze-ci-image-build-line-51)">│</text><text
class="breeze-ci-image-build-r1" x="463.6" y="1264.4" textLength="976"
clip-path="url(#breeze-ci-image-build-line-51)">itself).                                     
[...]
</text><text class="breeze-ci-image-build-r5" x="0" y="1288.8"
textLength="12.2" clip-path="url(#breeze-ci-image-build-line-52)">│</text><text
class="breeze-ci-image-build-r7" x="463.6" y="1288.8" textLength="976"
clip-path="url(#breeze-ci-image-build-line-52)">(TEXT)                                     &#
[...]
diff --git a/images/breeze/output_ci-image_build.txt
b/images/breeze/output_ci-image_build.txt
index 71765b3d76..f659f125e8 100644
--- a/images/breeze/output_ci-image_build.txt
+++ b/images/breeze/output_ci-image_build.txt
@@ -1 +1 @@
-5a1b532b087c0feb24ffdc9da3ec4e81
+c405885e9a457ff1ca8caa8a3ebab6e5
diff --git a/images/breeze/output_prod-image_build.svg
b/images/breeze/output_prod-image_build.svg
index 31e599f23d..079f3f39e6 100644
--- a/images/breeze/output_prod-image_build.svg
+++ b/images/breeze/output_prod-image_build.svg
@@ -394,7 +394,7 @@
</text><text class="breeze-prod-image-build-r5" x="0" y="1069.2"
textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-43)">│</text><text
class="breeze-prod-image-build-r4" x="24.4" y="1069.2" textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-43)">-</text><text
class="breeze-prod-image-build-r4" x="36.6" y="1069.2" textLength="85.4"
clip-path="url(#breeze-prod-image-build-line-43)">-python</text><text
class="breeze-prod-image-build-r4" x="122" y="1069.2" textLength= [...]
</text><text class="breeze-prod-image-build-r5" x="0" y="1093.6"
textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-44)">│</text><text
class="breeze-prod-image-build-r1" x="463.6" y="1093.6" textLength="976"
clip-path="url(#breeze-prod-image-build-line-44)">something like: python:VERSION-slim-bookworm.                            
[...]
</text><text class="breeze-prod-image-build-r5" x="0" y="1118"
textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-45)">│</text><text
class="breeze-prod-image-build-r7" x="463.6" y="1118" textLength="976"
clip-path="url(#breeze-prod-image-build-line-45)">(TEXT)                                    
[...]
-</text><text class="breeze-prod-image-build-r5" x="0" y="1142.4"
textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-46)">│</text><text
class="breeze-prod-image-build-r4" x="24.4" y="1142.4" textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-46)">-</text><text
class="breeze-prod-image-build-r4" x="36.6" y="1142.4" textLength="134.2"
clip-path="url(#breeze-prod-image-build-line-46)">-additional</text><text
class="breeze-prod-image-build-r4" x="170.8" y="1142.4" text [...]
+</text><text class="breeze-prod-image-build-r5" x="0" y="1142.4"
textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-46)">│</text><text
class="breeze-prod-image-build-r4" x="24.4" y="1142.4" textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-46)">-</text><text
class="breeze-prod-image-build-r4" x="36.6" y="1142.4" textLength="134.2"
clip-path="url(#breeze-prod-image-build-line-46)">-additional</text><text
class="breeze-prod-image-build-r4" x="170.8" y="1142.4" text [...]
</text><text class="breeze-prod-image-build-r5" x="0" y="1166.8"
textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-47)">│</text><text
class="breeze-prod-image-build-r4" x="24.4" y="1166.8" textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-47)">-</text><text
class="breeze-prod-image-build-r4" x="36.6" y="1166.8" textLength="134.2"
clip-path="url(#breeze-prod-image-build-line-47)">-additional</text><text
class="breeze-prod-image-build-r4" x="170.8" y="1166.8" text [...]
</text><text class="breeze-prod-image-build-r5" x="0" y="1191.2"
textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-48)">│</text><text
class="breeze-prod-image-build-r1" x="463.6" y="1191.2" textLength="976"
clip-path="url(#breeze-prod-image-build-line-48)">itself).                                   
[...]
</text><text class="breeze-prod-image-build-r5" x="0" y="1215.6"
textLength="12.2"
clip-path="url(#breeze-prod-image-build-line-49)">│</text><text
class="breeze-prod-image-build-r7" x="463.6" y="1215.6" textLength="976"
clip-path="url(#breeze-prod-image-build-line-49)">(TEXT)                                    
[...]
diff --git a/images/breeze/output_prod-image_build.txt
b/images/breeze/output_prod-image_build.txt
index e511dfeeb4..aac6b4aab7 100644
--- a/images/breeze/output_prod-image_build.txt
+++ b/images/breeze/output_prod-image_build.txt
@@ -1 +1 @@
-bdbf7fe98a65e3384825cc99c9ea03e9
+1eed0951812bd758082ffe34daed932b
