Skip to content

Commit acdf85b

Browse files
authored
Cleanup CI after Airflow 2.10.4 release (#45014)
Airflow 2.10.4 was released! Wohooo! Time to clean-up some leftovers: - Make backcompat tests with 2.10.4 and not 2.10.3 - Add version reference in global constants - Remove workaround for eval-type-backport because of Pydantic change
1 parent 60eced9 commit acdf85b

File tree

3 files changed

+2
-33
lines changed

3 files changed

+2
-33
lines changed

Dockerfile.ci

-16
Original file line numberDiff line numberDiff line change
@@ -993,22 +993,6 @@ function determine_airflow_to_use() {
993993
--constraint https://raw.githubusercontent.com/apache/airflow/constraints-main/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt
994994
# Some packages might leave legacy typing module which causes test issues
995995
pip uninstall -y typing || true
996-
# We need to install `eval-type-backport` to avoid problems with Pydantic 2.10.+ released in
997-
# November 2024 for python 3.8 and 3.9. While Pydantic 2.10.0/2.10.1 completely broke Airflow 2
998-
# installation and Pydantic 2.10.2 fixed the issue for past versions of Airflow, there are still
999-
# Some Typing constructs that are not handled well by Pydantic and in case Pydantic fails with
1000-
# those errors, it will STILL fall back to `eval-type-backport` to handle those cases (if
1001-
# if `eval-type-backport` is installed. Therefore - until we have Airflow 2.10.3 for backwards
1002-
# compatibility tests and we attempt to install "edge" provider that might use such breaking
1003-
# constructs, we need to install `eval-type-backport` to avoid problems with Pydantic 2.10.2+
1004-
# as well. As soon as we move to Airflow 2.10.4, we can remove this workaround because Airflow
1005-
# 2.10.4 adds "eval-type-backport" as a dependency and it will be installed automatically.
1006-
if [[ ${PYTHON_MAJOR_MINOR_VERSION} == "3.8" || ${PYTHON_MAJOR_MINOR_VERSION} == "3.9" ]]; then
1007-
echo
1008-
echo "${COLOR_BLUE}Installing eval-type-backport for Python ${PYTHON_MAJOR_MINOR_VERSION} to workaround Pydantic 2.10.0/2.10.1 issue with new typing style.${COLOR_RESET}"
1009-
echo
1010-
pip install eval-type-backport>=0.2.0
1011-
fi
1012996
if [[ ${LINK_PROVIDERS_TO_AIRFLOW_PACKAGE=} == "true" ]]; then
1013997
echo
1014998
echo "${COLOR_BLUE}Linking providers to airflow package as we are using them from mounted sources.${COLOR_RESET}"

dev/breeze/src/airflow_breeze/global_constants.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ def get_default_platform_machine() -> str:
421421
"2.10.1": ["3.8", "3.9", "3.10", "3.11", "3.12"],
422422
"2.10.2": ["3.8", "3.9", "3.10", "3.11", "3.12"],
423423
"2.10.3": ["3.8", "3.9", "3.10", "3.11", "3.12"],
424+
"2.10.4": ["3.8", "3.9", "3.10", "3.11", "3.12"],
424425
}
425426

426427
DB_RESET = False
@@ -619,7 +620,7 @@ def get_airflow_extras():
619620
},
620621
{
621622
"python-version": "3.9",
622-
"airflow-version": "2.10.3",
623+
"airflow-version": "2.10.4",
623624
"remove-providers": "cloudant fab",
624625
"run-tests": "true",
625626
},

scripts/docker/entrypoint_ci.sh

-16
Original file line numberDiff line numberDiff line change
@@ -226,22 +226,6 @@ function determine_airflow_to_use() {
226226
--constraint https://raw.githubusercontent.com/apache/airflow/constraints-main/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt
227227
# Some packages might leave legacy typing module which causes test issues
228228
pip uninstall -y typing || true
229-
# We need to install `eval-type-backport` to avoid problems with Pydantic 2.10.+ released in
230-
# November 2024 for python 3.8 and 3.9. While Pydantic 2.10.0/2.10.1 completely broke Airflow 2
231-
# installation and Pydantic 2.10.2 fixed the issue for past versions of Airflow, there are still
232-
# Some Typing constructs that are not handled well by Pydantic and in case Pydantic fails with
233-
# those errors, it will STILL fall back to `eval-type-backport` to handle those cases (if
234-
# if `eval-type-backport` is installed. Therefore - until we have Airflow 2.10.3 for backwards
235-
# compatibility tests and we attempt to install "edge" provider that might use such breaking
236-
# constructs, we need to install `eval-type-backport` to avoid problems with Pydantic 2.10.2+
237-
# as well. As soon as we move to Airflow 2.10.4, we can remove this workaround because Airflow
238-
# 2.10.4 adds "eval-type-backport" as a dependency and it will be installed automatically.
239-
if [[ ${PYTHON_MAJOR_MINOR_VERSION} == "3.8" || ${PYTHON_MAJOR_MINOR_VERSION} == "3.9" ]]; then
240-
echo
241-
echo "${COLOR_BLUE}Installing eval-type-backport for Python ${PYTHON_MAJOR_MINOR_VERSION} to workaround Pydantic 2.10.0/2.10.1 issue with new typing style.${COLOR_RESET}"
242-
echo
243-
pip install eval-type-backport>=0.2.0
244-
fi
245229
if [[ ${LINK_PROVIDERS_TO_AIRFLOW_PACKAGE=} == "true" ]]; then
246230
echo
247231
echo "${COLOR_BLUE}Linking providers to airflow package as we are using them from mounted sources.${COLOR_RESET}"

0 commit comments

Comments
 (0)