Skip to content

Commit ded01a5

Browse files
authored
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
1 parent 3dc99d8 commit ded01a5

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

Dockerfile.ci

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,14 +1117,11 @@ RUN echo "Airflow version: ${AIRFLOW_VERSION}"
11171117
# force them on the main Airflow package. Currently we need no extra limits as PIP 23.1+ has much better
11181118
# dependency resolution and we do not need to limit the versions of the dependencies
11191119
#
1120-
# Without grpcio-status limit, pip gets into very long backtracking
1121-
# We should attempt to remove it in the future
1122-
#
11231120
# Aiobotocore is limited for eager upgrade because it either causes a long backtracking or
11241121
# conflict when we do not limit it. It seems that `pip` has a hard time figuring the right
11251122
# combination of dependencies for aiobotocore, botocore, boto3 and s3fs together
11261123
#
1127-
ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="grpcio-status>=1.55.0 aiobotocore>=2.5.4"
1124+
ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="aiobotocore>=2.5.4"
11281125
ARG UPGRADE_TO_NEWER_DEPENDENCIES="false"
11291126
ARG VERSION_SUFFIX_FOR_PYPI=""
11301127

airflow/providers/apache/spark/provider.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ versions:
5555
dependencies:
5656
- apache-airflow>=2.6.0
5757
- pyspark
58-
- grpcio-status
58+
- grpcio-status>=1.59.0
5959

6060
integrations:
6161
- integration-name: Apache Spark

generated/provider_dependencies.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
"apache.spark": {
207207
"deps": [
208208
"apache-airflow>=2.6.0",
209-
"grpcio-status",
209+
"grpcio-status>=1.59.0",
210210
"pyspark"
211211
],
212212
"cross-providers-deps": [

0 commit comments

Comments
 (0)