[DO NOT MERGE] Testing if pip 24.3 pre-release works with Airflow

apache · Oct 26, 2024 · bba3c21 · bba3c21
1 parent 77783e0
commit bba3c21
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 17 deletions.
diff --git a/.github/workflows/additional-ci-image-checks.yml b/.github/workflows/additional-ci-image-checks.yml
@@ -113,7 +113,7 @@ jobs:
       python-versions: ${{ inputs.python-versions }}
       branch: ${{ inputs.branch }}
       constraints-branch: ${{ inputs.constraints-branch }}
-      use-uv: "true"
+      use-uv: "false"
       include-success-outputs: ${{ inputs.include-success-outputs }}
       docker-cache: ${{ inputs.docker-cache }}
       disable-airflow-repo-cache: ${{ inputs.disable-airflow-repo-cache }}

diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -203,7 +203,7 @@ jobs:
       pull-request-target: "true"
       is-committer-build: ${{ needs.build-info.outputs.is-committer-build }}
       push-image: "true"
-      use-uv: "true"
+      use-uv: "false"
       image-tag: ${{ needs.build-info.outputs.image-tag }}
       platform: "linux/amd64"
       python-versions: ${{ needs.build-info.outputs.python-versions }}
@@ -248,7 +248,7 @@ jobs:
       pull-request-target: "true"
       is-committer-build: ${{ needs.build-info.outputs.is-committer-build }}
       push-image: "true"
-      use-uv: "true"
+      use-uv: "false"
       image-tag: ${{ needs.build-info.outputs.image-tag }}
       platform: linux/amd64
       python-versions: ${{ needs.build-info.outputs.python-versions }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -205,7 +205,7 @@ jobs:
       platform: "linux/amd64"
       python-versions: ${{ needs.build-info.outputs.python-versions }}
       branch: ${{ needs.build-info.outputs.default-branch }}
-      use-uv: "true"
+      use-uv: "false"
       upgrade-to-newer-dependencies: ${{ needs.build-info.outputs.upgrade-to-newer-dependencies }}
       constraints-branch: ${{ needs.build-info.outputs.default-constraints-branch }}
       docker-cache: ${{ needs.build-info.outputs.docker-cache }}
@@ -556,7 +556,7 @@ jobs:
       default-python-version: ${{ needs.build-info.outputs.default-python-version }}
       branch: ${{ needs.build-info.outputs.default-branch }}
       push-image: "true"
-      use-uv: "true"
+      use-uv: "false"
       build-provider-packages: ${{ needs.build-info.outputs.default-branch == 'main' }}
       upgrade-to-newer-dependencies: ${{ needs.build-info.outputs.upgrade-to-newer-dependencies }}
       chicken-egg-providers: ${{ needs.build-info.outputs.chicken-egg-providers }}

diff --git a/.github/workflows/finalize-tests.yml b/.github/workflows/finalize-tests.yml
@@ -149,7 +149,7 @@ jobs:
       python-versions: ${{ inputs.python-versions }}
       branch: ${{ inputs.branch }}
       constraints-branch: ${{ inputs.constraints-branch }}
-      use-uv: "true"
+      use-uv: "false"
       include-success-outputs: ${{ inputs.include-success-outputs }}
       docker-cache: ${{ inputs.docker-cache }}
       disable-airflow-repo-cache: ${{ inputs.disable-airflow-repo-cache }}

diff --git a/Dockerfile b/Dockerfile
@@ -49,7 +49,7 @@ ARG AIRFLOW_VERSION="2.10.2"
 
 ARG PYTHON_BASE_IMAGE="python:3.9-slim-bookworm"
 
-ARG AIRFLOW_PIP_VERSION=24.2
+ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
 ARG AIRFLOW_UV_VERSION=0.4.27
 ARG AIRFLOW_USE_UV="false"
 ARG UV_HTTP_TIMEOUT="300"
@@ -615,7 +615,7 @@ function common::install_packaging_tools() {
         echo "${COLOR_BLUE}Installing latest pip version${COLOR_RESET}"
         echo
         pip install --root-user-action ignore --disable-pip-version-check --upgrade pip
-    elif [[ ! ${AIRFLOW_PIP_VERSION} =~ [0-9.]* ]]; then
+    elif [[ ! ${AIRFLOW_PIP_VERSION} =~ ^[0-9].* ]]; then
         echo
         echo "${COLOR_BLUE}Installing pip version from spec ${AIRFLOW_PIP_VERSION}${COLOR_RESET}"
         echo
@@ -629,15 +629,19 @@ function common::install_packaging_tools() {
             echo "${COLOR_BLUE}(Re)Installing pip version: ${AIRFLOW_PIP_VERSION}${COLOR_RESET}"
             echo
             # shellcheck disable=SC2086
-            pip install --root-user-action ignore --disable-pip-version-check "pip==${AIRFLOW_PIP_VERSION}"
+            if [[ ${AIRFLOW_PIP_VERSION} =~ ^[0-9].* ]]; then
+                pip install --root-user-action ignore --disable-pip-version-check "pip==${AIRFLOW_PIP_VERSION}"
+            else
+                pip install --root-user-action ignore --disable-pip-version-check "pip @ ${AIRFLOW_PIP_VERSION}"
+            fi
         fi
     fi
     if [[ ${AIRFLOW_UV_VERSION=} == "" ]]; then
         echo
         echo "${COLOR_BLUE}Installing latest uv version${COLOR_RESET}"
         echo
         pip install --root-user-action ignore --disable-pip-version-check --upgrade uv
-    elif [[ ! ${AIRFLOW_UV_VERSION} =~ [0-9.]* ]]; then
+    elif [[ ! ${AIRFLOW_UV_VERSION} =~ ^[0-9].* ]]; then
         echo
         echo "${COLOR_BLUE}Installing uv version from spec ${AIRFLOW_UV_VERSION}${COLOR_RESET}"
         echo

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -561,7 +561,7 @@ function common::install_packaging_tools() {
         echo "${COLOR_BLUE}Installing latest pip version${COLOR_RESET}"
         echo
         pip install --root-user-action ignore --disable-pip-version-check --upgrade pip
-    elif [[ ! ${AIRFLOW_PIP_VERSION} =~ [0-9.]* ]]; then
+    elif [[ ! ${AIRFLOW_PIP_VERSION} =~ ^[0-9].* ]]; then
         echo
         echo "${COLOR_BLUE}Installing pip version from spec ${AIRFLOW_PIP_VERSION}${COLOR_RESET}"
         echo
@@ -575,15 +575,19 @@ function common::install_packaging_tools() {
             echo "${COLOR_BLUE}(Re)Installing pip version: ${AIRFLOW_PIP_VERSION}${COLOR_RESET}"
             echo
             # shellcheck disable=SC2086
-            pip install --root-user-action ignore --disable-pip-version-check "pip==${AIRFLOW_PIP_VERSION}"
+            if [[ ${AIRFLOW_PIP_VERSION} =~ ^[0-9].* ]]; then
+                pip install --root-user-action ignore --disable-pip-version-check "pip==${AIRFLOW_PIP_VERSION}"
+            else
+                pip install --root-user-action ignore --disable-pip-version-check "pip @ ${AIRFLOW_PIP_VERSION}"
+            fi
         fi
     fi
     if [[ ${AIRFLOW_UV_VERSION=} == "" ]]; then
         echo
         echo "${COLOR_BLUE}Installing latest uv version${COLOR_RESET}"
         echo
         pip install --root-user-action ignore --disable-pip-version-check --upgrade uv
-    elif [[ ! ${AIRFLOW_UV_VERSION} =~ [0-9.]* ]]; then
+    elif [[ ! ${AIRFLOW_UV_VERSION} =~ ^[0-9].* ]]; then
         echo
         echo "${COLOR_BLUE}Installing uv version from spec ${AIRFLOW_UV_VERSION}${COLOR_RESET}"
         echo
@@ -1362,7 +1366,7 @@ RUN bash /scripts/docker/install_packaging_tools.sh; \
 
 # Here we fix the versions so all subsequent commands will use the versions
 # from the sources
-ARG AIRFLOW_PIP_VERSION=24.2
+ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
 ARG AIRFLOW_UV_VERSION=0.4.27
 
 ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION} \

diff --git a/scripts/docker/common.sh b/scripts/docker/common.sh
@@ -132,7 +132,7 @@ function common::install_packaging_tools() {
         echo "${COLOR_BLUE}Installing latest pip version${COLOR_RESET}"
         echo
         pip install --root-user-action ignore --disable-pip-version-check --upgrade pip
-    elif [[ ! ${AIRFLOW_PIP_VERSION} =~ [0-9.]* ]]; then
+    elif [[ ! ${AIRFLOW_PIP_VERSION} =~ ^[0-9].* ]]; then
         echo
         echo "${COLOR_BLUE}Installing pip version from spec ${AIRFLOW_PIP_VERSION}${COLOR_RESET}"
         echo
@@ -146,15 +146,19 @@ function common::install_packaging_tools() {
             echo "${COLOR_BLUE}(Re)Installing pip version: ${AIRFLOW_PIP_VERSION}${COLOR_RESET}"
             echo
             # shellcheck disable=SC2086
-            pip install --root-user-action ignore --disable-pip-version-check "pip==${AIRFLOW_PIP_VERSION}"
+            if [[ ${AIRFLOW_PIP_VERSION} =~ ^[0-9].* ]]; then
+                pip install --root-user-action ignore --disable-pip-version-check "pip==${AIRFLOW_PIP_VERSION}"
+            else
+                pip install --root-user-action ignore --disable-pip-version-check "pip @ ${AIRFLOW_PIP_VERSION}"
+            fi
         fi
     fi
     if [[ ${AIRFLOW_UV_VERSION=} == "" ]]; then
         echo
         echo "${COLOR_BLUE}Installing latest uv version${COLOR_RESET}"
         echo
         pip install --root-user-action ignore --disable-pip-version-check --upgrade uv
-    elif [[ ! ${AIRFLOW_UV_VERSION} =~ [0-9.]* ]]; then
+    elif [[ ! ${AIRFLOW_UV_VERSION} =~ ^[0-9].* ]]; then
         echo
         echo "${COLOR_BLUE}Installing uv version from spec ${AIRFLOW_UV_VERSION}${COLOR_RESET}"
         echo