(airflow) branch main updated: Fix failing pydantic v1 tests (#41534)

[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 a033c5f15a Fix failing pydantic v1 tests (#41534)
a033c5f15a is described below

commit a033c5f15a033c751419506ea77ffdbacdd37705
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Fri Aug 16 15:14:53 2024 +0200

    Fix failing pydantic v1 tests (#41534)
    
    We need to exclude some versions of Pydantic v1 because it conflicts
    with aws provider.
---
 Dockerfile.ci                   | 3 ++-
 scripts/docker/entrypoint_ci.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 14ccb669f6..06a7343c82 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1068,8 +1068,9 @@ function check_pydantic() {
         echo
         echo "${COLOR_YELLOW}Downgrading Pydantic to < 2${COLOR_RESET}"
         echo
+        # Pydantic 1.10.17/1.10.15 conflicts with aws-sam-translator so we 
need to exclude it
         # shellcheck disable=SC2086
-        ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade 
"pydantic<2.0.0"
+        ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade 
"pydantic<2.0.0,!=1.10.17,!=1.10.15"
         pip check
     else
         echo
diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
index 1ff3ef0cd2..da7ff30976 100755
--- a/scripts/docker/entrypoint_ci.sh
+++ b/scripts/docker/entrypoint_ci.sh
@@ -289,8 +289,9 @@ function check_pydantic() {
         echo
         echo "${COLOR_YELLOW}Downgrading Pydantic to < 2${COLOR_RESET}"
         echo
+        # Pydantic 1.10.17/1.10.15 conflicts with aws-sam-translator so we 
need to exclude it
         # shellcheck disable=SC2086
-        ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade 
"pydantic<2.0.0"
+        ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade 
"pydantic<2.0.0,!=1.10.17,!=1.10.15"
         pip check
     else
         echo