From 3739548fe01842add7b998075a4e4cb5e1cb9c1a Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Wed, 18 Jan 2023 07:30:51 +0100 Subject: [PATCH] Remove limit for dnspython after eventlet got fixed The https://github.com/eventlet/eventlet/pull/782 fixed error that caused the need to limit dnspython and eventlet 0.33.3 has been released. We can now remove the limit for dnspython as long as we also limit eventlet to >=0.33.3. --- airflow/providers/apache/cassandra/provider.yaml | 5 ----- generated/provider_dependencies.json | 3 +-- setup.py | 7 +------ 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/airflow/providers/apache/cassandra/provider.yaml b/airflow/providers/apache/cassandra/provider.yaml index a7681f50cf6d2..961bbd36798f7 100644 --- a/airflow/providers/apache/cassandra/provider.yaml +++ b/airflow/providers/apache/cassandra/provider.yaml @@ -36,11 +36,6 @@ versions: dependencies: - apache-airflow>=2.3.0 - cassandra-driver>=3.13.0 - # dnspython 2.3.0 is not compatible with eventlet that cassandra-driver uses under-the-hood - # This can be removed when the issue is resolved (reported in two places): - # * https://github.com/eventlet/eventlet/issues/781 - # * https://datastax-oss.atlassian.net/browse/PYTHON-1320 - - dnspython<2.3.0 integrations: - integration-name: Apache Cassandra diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index de2a7b5164180..90f878796bb95 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -53,8 +53,7 @@ "apache.cassandra": { "deps": [ "apache-airflow>=2.3.0", - "cassandra-driver>=3.13.0", - "dnspython<2.3.0" + "cassandra-driver>=3.13.0" ], "cross-providers-deps": [] }, diff --git a/setup.py b/setup.py index 747532e39e2e8..4a2e10ab375b6 100644 --- a/setup.py +++ b/setup.py @@ -216,12 +216,7 @@ def write_version(filename: str = str(AIRFLOW_SOURCES_ROOT / "airflow" / "git_ve # If you change this mark you should also change ./scripts/ci/check_order_setup.py # Start dependencies group async_packages = [ - # dnspython 2.3.0 is not compatible with eventlet. - # This can be removed when the issue is resolved (reported in two places): - # * https://github.com/eventlet/eventlet/issues/781 - # * https://datastax-oss.atlassian.net/browse/PYTHON-1320 - "dnspython<2.3.0", - "eventlet>=0.9.7", + "eventlet>=0.33.3", "gevent>=0.13", "greenlet>=0.4.9", ]