This is an automated email from the ASF dual-hosted git repository.
ferruzzi 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 b134ed089b7 Remove Pydantic 2.10.0/2.10.1 workaround (#44400)
b134ed089b7 is described below
commit b134ed089b74021858ded34dbc021ef053427650
Author: Jarek Potiuk <[email protected]>
AuthorDate: Tue Nov 26 22:39:23 2024 +0000
Remove Pydantic 2.10.0/2.10.1 workaround (#44400)
The Pydantic 2.10.0/2.10.1 workaround implemented in #44317 is not
needed any more as it has been fixed in Pydantic 2.10.2 in
the https://github.com/pydantic/pydantic/pull/10962
This PR removes the workaround and bumps min Pydantic version to
2.10.2.
---
Dockerfile.ci | 9 ---------
generated/provider_dependencies.json | 2 +-
hatch_build.py | 3 +--
providers/src/airflow/providers/edge/provider.yaml | 2 +-
scripts/docker/entrypoint_ci.sh | 9 ---------
5 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/Dockerfile.ci b/Dockerfile.ci
index b3686b782ad..51a83660f69 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1004,15 +1004,6 @@ function determine_airflow_to_use() {
--constraint
https://raw.githubusercontent.com/apache/airflow/constraints-main/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt
# Some packages might leave legacy typing module which causes test
issues
pip uninstall -y typing || true
- # We need to install `eval-type-backport` to avoid problems with
Pydantic 2.10.0/2.10.1 released in
- # November 2024 for python 3.8 and 3.9. Hopefully this is only a
temporary measure that will be
- # solved in Pydantic 2.10.2 by addressing
https://github.com/pydantic/pydantic/issues/10958
- if [[ ${PYTHON_MAJOR_MINOR_VERSION} == "3.8" ||
${PYTHON_MAJOR_MINOR_VERSION} == "3.9" ]]; then
- echo
- 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}"
- echo
- pip install eval-type-backport>=0.2.0
- fi
if [[ ${LINK_PROVIDERS_TO_AIRFLOW_PACKAGE=} == "true" ]]; then
echo
echo "${COLOR_BLUE}Linking providers to airflow package as we are
using them from mounted sources.${COLOR_RESET}"
diff --git a/generated/provider_dependencies.json
b/generated/provider_dependencies.json
index 2d15d539756..d8c6830df26 100644
--- a/generated/provider_dependencies.json
+++ b/generated/provider_dependencies.json
@@ -528,7 +528,7 @@
"edge": {
"deps": [
"apache-airflow>=2.10.0",
- "pydantic>=2.10.1"
+ "pydantic>=2.10.2"
],
"devel-deps": [],
"plugins": [
diff --git a/hatch_build.py b/hatch_build.py
index 61cf1563f96..fea922a9d02 100644
--- a/hatch_build.py
+++ b/hatch_build.py
@@ -414,8 +414,7 @@ DEPENDENCIES = [
'pendulum>=3.0.0,<4.0;python_version>="3.12"',
"pluggy>=1.5.0",
"psutil>=5.8.0",
- # https://github.com/pydantic/pydantic/issues/10910
- "pydantic>=2.10.1",
+ "pydantic>=2.10.2",
"pygments>=2.0.1",
"pyjwt>=2.0.0",
"python-daemon>=3.0.0",
diff --git a/providers/src/airflow/providers/edge/provider.yaml
b/providers/src/airflow/providers/edge/provider.yaml
index 9852f763191..77e63a1f580 100644
--- a/providers/src/airflow/providers/edge/provider.yaml
+++ b/providers/src/airflow/providers/edge/provider.yaml
@@ -31,7 +31,7 @@ versions:
dependencies:
- apache-airflow>=2.10.0
- - pydantic>=2.10.1
+ - pydantic>=2.10.2
plugins:
- name: edge_executor
diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
index b24e89a8474..956b18a666b 100755
--- a/scripts/docker/entrypoint_ci.sh
+++ b/scripts/docker/entrypoint_ci.sh
@@ -236,15 +236,6 @@ function determine_airflow_to_use() {
--constraint
https://raw.githubusercontent.com/apache/airflow/constraints-main/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt
# Some packages might leave legacy typing module which causes test
issues
pip uninstall -y typing || true
- # We need to install `eval-type-backport` to avoid problems with
Pydantic 2.10.0/2.10.1 released in
- # November 2024 for python 3.8 and 3.9. Hopefully this is only a
temporary measure that will be
- # solved in Pydantic 2.10.2 by addressing
https://github.com/pydantic/pydantic/issues/10958
- if [[ ${PYTHON_MAJOR_MINOR_VERSION} == "3.8" ||
${PYTHON_MAJOR_MINOR_VERSION} == "3.9" ]]; then
- echo
- 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}"
- echo
- pip install eval-type-backport>=0.2.0
- fi
if [[ ${LINK_PROVIDERS_TO_AIRFLOW_PACKAGE=} == "true" ]]; then
echo
echo "${COLOR_BLUE}Linking providers to airflow package as we are
using them from mounted sources.${COLOR_RESET}"
