From 35871f8bb537390fc435a4b83e53da452494725f Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Sat, 15 Jun 2024 12:13:06 +0200 Subject: [PATCH] Add dependency to httpx >= 0.25.0 everywhere (#40256) Our "lowest-dependency" tests detectaed that weaviate client depends implicitly on httpx >= 0.19.0 (imports USE_CLIENT_DEFAULTS from httpx and it's missing < 0.19.0). Howeer this error is raised during importing of examples for weaviate in "Always" tests, and closer look at weaviate shows that it actually has >=0.25.0 and it makes sense for all our providers to bump httpx to 0.25.0 as minimum as well as add it to weaviate explicitly.. --- airflow/providers/google/provider.yaml | 2 +- airflow/providers/weaviate/provider.yaml | 1 + generated/provider_dependencies.json | 3 ++- hatch_build.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/airflow/providers/google/provider.yaml b/airflow/providers/google/provider.yaml index 17481be792fbf..91ae148ce2138 100644 --- a/airflow/providers/google/provider.yaml +++ b/airflow/providers/google/provider.yaml @@ -154,7 +154,7 @@ dependencies: - google-cloud-run>=0.10.0 - google-cloud-batch>=0.13.0 - grpcio-gcp>=0.2.2 - - httpx>=0.18.0 + - httpx>=0.25.0 - json-merge-patch>=0.2 - looker-sdk>=22.4.0 - pandas-gbq>=0.7.0 diff --git a/airflow/providers/weaviate/provider.yaml b/airflow/providers/weaviate/provider.yaml index 9c1b5643d100c..6c9c933aeb8e2 100644 --- a/airflow/providers/weaviate/provider.yaml +++ b/airflow/providers/weaviate/provider.yaml @@ -48,6 +48,7 @@ integrations: dependencies: - apache-airflow>=2.7.0 + - httpx>=0.25.0 - weaviate-client>=3.24.2 # 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/generated/provider_dependencies.json b/generated/provider_dependencies.json index a13990c610ce5..44fd883ef1143 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -631,7 +631,7 @@ "google-cloud-vision>=3.4.0", "google-cloud-workflows>=1.10.0", "grpcio-gcp>=0.2.2", - "httpx>=0.18.0", + "httpx>=0.25.0", "json-merge-patch>=0.2", "looker-sdk>=22.4.0", "pandas-gbq>=0.7.0", @@ -1304,6 +1304,7 @@ "weaviate": { "deps": [ "apache-airflow>=2.7.0", + "httpx>=0.25.0", "pandas>=1.5.3,<2.2;python_version<\"3.12\"", "pandas>=2.1.1,<2.2;python_version>=\"3.12\"", "weaviate-client>=3.24.2" diff --git a/hatch_build.py b/hatch_build.py index 97c3c1a6a911e..5af5b01f0355e 100644 --- a/hatch_build.py +++ b/hatch_build.py @@ -443,7 +443,7 @@ 'google-re2>=1.0;python_version<"3.12"', 'google-re2>=1.1;python_version>="3.12"', "gunicorn>=20.1.0", - "httpx>=0.18.0", + "httpx>=0.25.0", 'importlib_metadata>=6.5;python_version<"3.12"', # Importib_resources 6.2.0-6.3.1 break pytest_rewrite # see https://github.com/python/importlib_resources/issues/299