From 46759d23ffd9d46de1002ae9c4441ea187c22716 Mon Sep 17 00:00:00 2001 From: GPK Date: Sat, 12 Oct 2024 08:47:57 +0100 Subject: [PATCH] Restrict looker-sdk version 24.18.0 and microsoft-kiota-http 1.3.4 (#42954) * restrict looker version 24.18.0 * update microsoft provider deps with microsoft-kiota-http * update gh issue ids to provider yaml files * ignore type in applfowhook * ignore type in applfowhook * ignore type in applfowhook --- generated/provider_dependencies.json | 3 ++- .../src/airflow/providers/amazon/aws/hooks/appflow.py | 8 ++++---- providers/src/airflow/providers/google/provider.yaml | 4 +++- .../src/airflow/providers/microsoft/azure/provider.yaml | 3 +++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index e6a0deca23cb..4d921fc1fb91 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -681,7 +681,7 @@ "httpx>=0.25.0", "immutabledict>=4.2.0", "json-merge-patch>=0.2", - "looker-sdk>=22.4.0", + "looker-sdk>=22.4.0,!=24.18.0", "pandas-gbq>=0.7.0", "pandas>=1.5.3,<2.2;python_version<\"3.9\"", "pandas>=2.1.2,<2.2;python_version>=\"3.9\"", @@ -827,6 +827,7 @@ "azure-storage-file-share>=12.7.0", "azure-synapse-artifacts>=0.17.0", "azure-synapse-spark>=0.2.0", + "microsoft-kiota-http>=1.3.0,!=1.3.4", "msgraph-core>=1.0.0" ], "devel-deps": [ diff --git a/providers/src/airflow/providers/amazon/aws/hooks/appflow.py b/providers/src/airflow/providers/amazon/aws/hooks/appflow.py index 5ef994917926..e68637e50dc0 100644 --- a/providers/src/airflow/providers/amazon/aws/hooks/appflow.py +++ b/providers/src/airflow/providers/amazon/aws/hooks/appflow.py @@ -117,9 +117,9 @@ def update_flow_filter(self, flow_name: str, filter_tasks, set_trigger_ondemand: self.conn.update_flow( flowName=response["flowName"], - destinationFlowConfigList=response["destinationFlowConfigList"], - sourceFlowConfig=response["sourceFlowConfig"], - triggerConfig=response["triggerConfig"], + destinationFlowConfigList=response["destinationFlowConfigList"], # type: ignore[arg-type] + sourceFlowConfig=response["sourceFlowConfig"], # type: ignore[arg-type] + triggerConfig=response["triggerConfig"], # type: ignore[arg-type] description=response.get("description", "Flow description."), - tasks=tasks, + tasks=tasks, # type: ignore[arg-type] ) diff --git a/providers/src/airflow/providers/google/provider.yaml b/providers/src/airflow/providers/google/provider.yaml index 9e469d278775..196a035badc4 100644 --- a/providers/src/airflow/providers/google/provider.yaml +++ b/providers/src/airflow/providers/google/provider.yaml @@ -157,7 +157,9 @@ dependencies: - grpcio-gcp>=0.2.2 - httpx>=0.25.0 - json-merge-patch>=0.2 - - looker-sdk>=22.4.0 + # looker-sdk 24.18.0 has issues in import looker_sdk.rtl, No module named looker_sdk.rtl + # See https://github.com/looker-open-source/sdk-codegen/issues/1518 + - looker-sdk>=22.4.0,!=24.18.0 - pandas-gbq>=0.7.0 # In pandas 2.2 minimal version of the sqlalchemy is 2.0 # https://pandas.pydata.org/docs/whatsnew/v2.2.0.html#increased-minimum-versions-for-dependencies diff --git a/providers/src/airflow/providers/microsoft/azure/provider.yaml b/providers/src/airflow/providers/microsoft/azure/provider.yaml index a47ec86de9f7..cf0b3f75ef9d 100644 --- a/providers/src/airflow/providers/microsoft/azure/provider.yaml +++ b/providers/src/airflow/providers/microsoft/azure/provider.yaml @@ -108,6 +108,9 @@ dependencies: - azure-mgmt-containerregistry>=8.0.0 - azure-mgmt-containerinstance>=10.1.0 - msgraph-core>=1.0.0 + # msgraph-core has transient import failures with microsoft-kiota-http==1.3.4 + # See https://github.com/microsoftgraph/msgraph-sdk-python-core/issues/706 + - microsoft-kiota-http>=1.3.0,!=1.3.4 devel-dependencies: - pywinrm