Skip to content

Commit

Permalink
Add azure, google, authentication library limits to eaager upgrade (#…
Browse files Browse the repository at this point in the history
…27535)

When generating constraints for released providers we hit the same
`pip` resolver backtracking issue - where it took very, very long
time to resolve the dependencies for installing released providers
on latest airflow from sources.

In #27531 we've added limits to provider.yaml but currently released
providers do not have those limits, so until we release them, we
should add the limits to "eager upgrade dependencies" in our CI
image - to help `pip` to figure out the right set of dependencies
much faster.

Also fixed a problem with extra "." in adal specification (seems it's
been ignored by `pip` anyway)

(cherry picked from commit a50195d)
  • Loading branch information
potiuk authored and ephraimbuddy committed Nov 11, 2022
1 parent aace91c commit 05beaba
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Dockerfile.ci
Expand Up @@ -1142,7 +1142,9 @@ RUN echo "Airflow version: ${AIRFLOW_VERSION}"
# are compatible with the new protobuf version. All the google python client libraries need
# to be upgraded to >= 2.0.0 in order to able to lift that limitation
# https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3 pyarrow>=6.0.0 protobuf<4.21.0"
# * authlib, gcloud_aio_auth, adal are needed to generate constraints for PyPI packages and can be removed after we release
# new google, azure providers
ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3 pyarrow>=6.0.0 protobuf<4.21.0 authlib>=1.0.0 gcloud_aio_auth>=4.0.0 adal>=1.2.7"
ARG UPGRADE_TO_NEWER_DEPENDENCIES="false"
ENV EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS=${EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS} \
UPGRADE_TO_NEWER_DEPENDENCIES=${UPGRADE_TO_NEWER_DEPENDENCIES}
Expand Down
1 change: 1 addition & 0 deletions airflow/providers/microsoft/azure/provider.yaml
Expand Up @@ -64,6 +64,7 @@ dependencies:
# Limited due to https://github.com/Azure/azure-uamqp-python/issues/191
- azure-servicebus>=7.6.1; platform_machine != "aarch64"
- azure-synapse-spark
- adal>=1.2.7

integrations:
- integration-name: Microsoft Azure Batch
Expand Down
1 change: 1 addition & 0 deletions generated/provider_dependencies.json
Expand Up @@ -432,6 +432,7 @@
},
"microsoft.azure": {
"deps": [
"adal>=1.2.7",
"apache-airflow>=2.2.0",
"azure-batch>=8.0.0",
"azure-cosmos>=4.0.0",
Expand Down

0 comments on commit 05beaba

Please sign in to comment.