This is an automated email from the ASF dual-hosted git repository.
potiuk 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 a50195d617 Add azure, google, authentication library limits to eaager
upgrade (#27535)
a50195d617 is described below
commit a50195d617ca7c85d56b1c138f46451bc7599618
Author: Jarek Potiuk <[email protected]>
AuthorDate: Mon Nov 7 02:31:51 2022 +0100
Add azure, google, authentication library limits to eaager upgrade (#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)
---
Dockerfile.ci | 4 +++-
airflow/providers/microsoft/azure/provider.yaml | 2 +-
generated/provider_dependencies.json | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Dockerfile.ci b/Dockerfile.ci
index ea3766699d..8019e04d20 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1153,7 +1153,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}
diff --git a/airflow/providers/microsoft/azure/provider.yaml
b/airflow/providers/microsoft/azure/provider.yaml
index 88adf73cbc..e4a7bf8b28 100644
--- a/airflow/providers/microsoft/azure/provider.yaml
+++ b/airflow/providers/microsoft/azure/provider.yaml
@@ -64,7 +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
+ - adal>=1.2.7
integrations:
- integration-name: Microsoft Azure Batch
diff --git a/generated/provider_dependencies.json
b/generated/provider_dependencies.json
index d86f146dfe..afa144de0b 100644
--- a/generated/provider_dependencies.json
+++ b/generated/provider_dependencies.json
@@ -427,7 +427,7 @@
},
"microsoft.azure": {
"deps": [
- "adal>=.1.2.7",
+ "adal>=1.2.7",
"apache-airflow>=2.3.0",
"azure-batch>=8.0.0",
"azure-cosmos>=4.0.0",
