This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v2-8-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit b2f3ade873e09ba48554bc86f2bdae96c9a65240 Author: Jarek Potiuk <[email protected]> AuthorDate: Mon Jan 8 18:51:24 2024 +0100 Bump min version for grpcio-status in spark provider (#36662) Previously we limited grpcio minimum version to stop backtracking of `pip` from happening and we could not do it in the limits of spark provider, becaue some google dependencies used it and conflicted with it. This problem is now gone as we have newer versions of google dependencies and we can not only safely move it to spark provider but also bump it slightly higher to limit the amount of backtracking we need to do. Extracted from #36537 (cherry picked from commit ded01a5aba337882fb19e03c24d7736c7154fdd8) --- Dockerfile.ci | 5 +---- airflow/providers/apache/spark/provider.yaml | 2 +- generated/provider_dependencies.json | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 411ff9b688..3364ee234f 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1116,14 +1116,11 @@ RUN echo "Airflow version: ${AIRFLOW_VERSION}" # force them on the main Airflow package. Currently we need no extra limits as PIP 23.1+ has much better # dependency resolution and we do not need to limit the versions of the dependencies # -# Without grpcio-status limit, pip gets into very long backtracking -# We should attempt to remove it in the future -# # Aiobotocore is limited for eager upgrade because it either causes a long backtracking or # conflict when we do not limit it. It seems that `pip` has a hard time figuring the right # combination of dependencies for aiobotocore, botocore, boto3 and s3fs together # -ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="grpcio-status>=1.55.0 aiobotocore>=2.5.4" +ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="aiobotocore>=2.5.4" ARG UPGRADE_TO_NEWER_DEPENDENCIES="false" ARG VERSION_SUFFIX_FOR_PYPI="" diff --git a/airflow/providers/apache/spark/provider.yaml b/airflow/providers/apache/spark/provider.yaml index fd5547f6a3..992deffadd 100644 --- a/airflow/providers/apache/spark/provider.yaml +++ b/airflow/providers/apache/spark/provider.yaml @@ -54,7 +54,7 @@ versions: dependencies: - apache-airflow>=2.6.0 - pyspark - - grpcio-status + - grpcio-status>=1.59.0 integrations: - integration-name: Apache Spark diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index 6769f237a5..7afeb80fae 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -207,7 +207,7 @@ "apache.spark": { "deps": [ "apache-airflow>=2.6.0", - "grpcio-status", + "grpcio-status>=1.59.0", "pyspark" ], "cross-providers-deps": [
