[airflow] branch main updated: Make eager upgrade additional dependencies optional (#30811)

[potiuk]

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 b4138b5774 Make eager upgrade additional dependencies optional (#30811)
b4138b5774 is described below

commit b4138b5774bfd640c2b57f82cd4e43dade29d205
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sat Apr 22 17:33:41 2023 +0200

    Make eager upgrade additional dependencies optional (#30811)
    
    In case additional dependencies are installed in customisation path
    of Docker, the eager upgrade dependencies are now empty after #30758,
    which made installation of extra dependencies fail.
    
    This PR makes it optional.
---
 Dockerfile                                        | 1 -
 Dockerfile.ci                                     | 1 -
 scripts/docker/install_additional_dependencies.sh | 1 -
 3 files changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8b6bfa38f7..d09dcdc526 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -684,7 +684,6 @@ set -euo pipefail
 
 : "${UPGRADE_TO_NEWER_DEPENDENCIES:?Should be true or false}"
 : "${ADDITIONAL_PYTHON_DEPS:?Should be set}"
-: "${EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS:?Should be set}"
 : "${AIRFLOW_PIP_VERSION:?Should be set}"
 
 . "$( dirname "${BASH_SOURCE[0]}" )/common.sh"
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 7197c2fdd6..ef654c416e 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -553,7 +553,6 @@ set -euo pipefail
 
 : "${UPGRADE_TO_NEWER_DEPENDENCIES:?Should be true or false}"
 : "${ADDITIONAL_PYTHON_DEPS:?Should be set}"
-: "${EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS:?Should be set}"
 : "${AIRFLOW_PIP_VERSION:?Should be set}"
 
 . "$( dirname "${BASH_SOURCE[0]}" )/common.sh"
diff --git a/scripts/docker/install_additional_dependencies.sh 
b/scripts/docker/install_additional_dependencies.sh
index a745d576f3..04cf52df9c 100644
--- a/scripts/docker/install_additional_dependencies.sh
+++ b/scripts/docker/install_additional_dependencies.sh
@@ -19,7 +19,6 @@ set -euo pipefail
 
 : "${UPGRADE_TO_NEWER_DEPENDENCIES:?Should be true or false}"
 : "${ADDITIONAL_PYTHON_DEPS:?Should be set}"
-: "${EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS:?Should be set}"
 : "${AIRFLOW_PIP_VERSION:?Should be set}"
 
 # shellcheck source=scripts/docker/common.sh