From a356ef468c90db4709b3a5e0491ac71d7d3b3bfa Mon Sep 17 00:00:00 2001 From: Elad Kalif <45845474+eladkal@users.noreply.github.com> Date: Tue, 21 May 2024 14:12:43 +0300 Subject: [PATCH 1/2] Pin requests due to incompatibility with docker-py --- airflow/providers/databricks/provider.yaml | 4 +++- airflow/providers/http/provider.yaml | 4 +++- airflow/providers/influxdb/provider.yaml | 4 +++- generated/provider_dependencies.json | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/airflow/providers/databricks/provider.yaml b/airflow/providers/databricks/provider.yaml index 104245378d7a7..5a8effc10e82b 100644 --- a/airflow/providers/databricks/provider.yaml +++ b/airflow/providers/databricks/provider.yaml @@ -65,7 +65,9 @@ versions: dependencies: - apache-airflow>=2.7.0 - apache-airflow-providers-common-sql>=1.10.0 - - requests>=2.27.0,<3 + # requests 2.32.0 has an incompatibility with python lib docker + # https://github.com/psf/requests/issues/6707 + - requests>=2.27.0,<2.32.0 # The connector 2.9.0 released on Aug 10, 2023 has a bug that it does not properly declare urllib3 and # it needs to be excluded. See https://github.com/databricks/databricks-sql-python/issues/190 # The 2.9.1 (to be released soon) already contains the fix diff --git a/airflow/providers/http/provider.yaml b/airflow/providers/http/provider.yaml index 242bb8204eed1..56fa5637ba684 100644 --- a/airflow/providers/http/provider.yaml +++ b/airflow/providers/http/provider.yaml @@ -60,7 +60,9 @@ dependencies: - apache-airflow>=2.7.0 # The 2.26.0 release of requests got rid of the chardet LGPL mandatory dependency, allowing us to # release it as a requirement for airflow - - requests>=2.27.0,<3 + # Also, requests 2.32.0 has an incompatibility with python lib docker + # https://github.com/psf/requests/issues/6707 + - requests>=2.27.0,<2.32.0 - requests_toolbelt - aiohttp>=3.9.2 - asgiref diff --git a/airflow/providers/influxdb/provider.yaml b/airflow/providers/influxdb/provider.yaml index 40f52cf8e54c1..2d7975689fc68 100644 --- a/airflow/providers/influxdb/provider.yaml +++ b/airflow/providers/influxdb/provider.yaml @@ -26,7 +26,9 @@ description: | dependencies: - apache-airflow>=2.7.0 - influxdb-client>=1.19.0 - - requests>=2.27.0,<3 + # requests 2.32.0 has an incompatibility with python lib docker + # https://github.com/psf/requests/issues/6707 + - requests>=2.27.0,<2.32.0 state: ready source-date-epoch: 1715384445 diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index 312ec7b4a664c..9811a12f6a79b 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -379,7 +379,7 @@ "apache-airflow-providers-common-sql>=1.10.0", "apache-airflow>=2.7.0", "databricks-sql-connector>=2.0.0, <3.0.0, !=2.9.0", - "requests>=2.27.0,<3" + "requests>=2.27.0,<2.32.0" ], "devel-deps": [ "deltalake>=0.12.0" @@ -638,7 +638,7 @@ "aiohttp>=3.9.2", "apache-airflow>=2.7.0", "asgiref", - "requests>=2.27.0,<3", + "requests>=2.27.0,<2.32.0", "requests_toolbelt" ], "devel-deps": [], @@ -659,7 +659,7 @@ "deps": [ "apache-airflow>=2.7.0", "influxdb-client>=1.19.0", - "requests>=2.27.0,<3" + "requests>=2.27.0,<2.32.0" ], "devel-deps": [], "cross-providers-deps": [], From 3772adaf0fc36f0cb642be0e2ead1304621c9b9d Mon Sep 17 00:00:00 2001 From: Elad Kalif <45845474+eladkal@users.noreply.github.com> Date: Tue, 21 May 2024 14:44:33 +0300 Subject: [PATCH 2/2] fix --- airflow/providers/databricks/provider.yaml | 4 +--- airflow/providers/docker/provider.yaml | 4 ++++ airflow/providers/http/provider.yaml | 4 +--- airflow/providers/influxdb/provider.yaml | 4 +--- generated/provider_dependencies.json | 9 +++++---- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/airflow/providers/databricks/provider.yaml b/airflow/providers/databricks/provider.yaml index 5a8effc10e82b..104245378d7a7 100644 --- a/airflow/providers/databricks/provider.yaml +++ b/airflow/providers/databricks/provider.yaml @@ -65,9 +65,7 @@ versions: dependencies: - apache-airflow>=2.7.0 - apache-airflow-providers-common-sql>=1.10.0 - # requests 2.32.0 has an incompatibility with python lib docker - # https://github.com/psf/requests/issues/6707 - - requests>=2.27.0,<2.32.0 + - requests>=2.27.0,<3 # The connector 2.9.0 released on Aug 10, 2023 has a bug that it does not properly declare urllib3 and # it needs to be excluded. See https://github.com/databricks/databricks-sql-python/issues/190 # The 2.9.1 (to be released soon) already contains the fix diff --git a/airflow/providers/docker/provider.yaml b/airflow/providers/docker/provider.yaml index 58a9d076b40cc..a9b83439bf177 100644 --- a/airflow/providers/docker/provider.yaml +++ b/airflow/providers/docker/provider.yaml @@ -69,6 +69,10 @@ dependencies: - apache-airflow>=2.7.0 - docker>=6 - python-dotenv>=0.21.0 + # requests 2.32.0 has an incompatibility with python lib docker + # https://github.com/psf/requests/issues/6707 and https://github.com/docker/docker-py/issues/3256 + # once resolved remove this dependency + - requests>=2.27.0,<2.32.0 integrations: - integration-name: Docker diff --git a/airflow/providers/http/provider.yaml b/airflow/providers/http/provider.yaml index 56fa5637ba684..242bb8204eed1 100644 --- a/airflow/providers/http/provider.yaml +++ b/airflow/providers/http/provider.yaml @@ -60,9 +60,7 @@ dependencies: - apache-airflow>=2.7.0 # The 2.26.0 release of requests got rid of the chardet LGPL mandatory dependency, allowing us to # release it as a requirement for airflow - # Also, requests 2.32.0 has an incompatibility with python lib docker - # https://github.com/psf/requests/issues/6707 - - requests>=2.27.0,<2.32.0 + - requests>=2.27.0,<3 - requests_toolbelt - aiohttp>=3.9.2 - asgiref diff --git a/airflow/providers/influxdb/provider.yaml b/airflow/providers/influxdb/provider.yaml index 2d7975689fc68..40f52cf8e54c1 100644 --- a/airflow/providers/influxdb/provider.yaml +++ b/airflow/providers/influxdb/provider.yaml @@ -26,9 +26,7 @@ description: | dependencies: - apache-airflow>=2.7.0 - influxdb-client>=1.19.0 - # requests 2.32.0 has an incompatibility with python lib docker - # https://github.com/psf/requests/issues/6707 - - requests>=2.27.0,<2.32.0 + - requests>=2.27.0,<3 state: ready source-date-epoch: 1715384445 diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index 9811a12f6a79b..2d0637c70828b 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -379,7 +379,7 @@ "apache-airflow-providers-common-sql>=1.10.0", "apache-airflow>=2.7.0", "databricks-sql-connector>=2.0.0, <3.0.0, !=2.9.0", - "requests>=2.27.0,<2.32.0" + "requests>=2.27.0,<3" ], "devel-deps": [ "deltalake>=0.12.0" @@ -443,7 +443,8 @@ "deps": [ "apache-airflow>=2.7.0", "docker>=6", - "python-dotenv>=0.21.0" + "python-dotenv>=0.21.0", + "requests>=2.27.0,<2.32.0" ], "devel-deps": [], "cross-providers-deps": [], @@ -638,7 +639,7 @@ "aiohttp>=3.9.2", "apache-airflow>=2.7.0", "asgiref", - "requests>=2.27.0,<2.32.0", + "requests>=2.27.0,<3", "requests_toolbelt" ], "devel-deps": [], @@ -659,7 +660,7 @@ "deps": [ "apache-airflow>=2.7.0", "influxdb-client>=1.19.0", - "requests>=2.27.0,<2.32.0" + "requests>=2.27.0,<3" ], "devel-deps": [], "cross-providers-deps": [],