This is an automated email from the ASF dual-hosted git repository.
ephraimanierobi pushed a commit to branch v2-8-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 619855884356abbd2e6d8a4f7956e4a0510b8c9e
Author: Andrey Anshin <andrey.ans...@taragol.is>
AuthorDate: Mon Nov 20 18:11:54 2023 +0400
Remove backcompat with Airflow 2.3/2.4 in providers (#35727)
* Remove backcompat with Airflow 2.3/2.4 in providers
* Revert changes in sql.py
---
airflow/providers/google/cloud/hooks/gcs.py | 9 +--------
airflow/providers/google/cloud/secrets/secret_manager.py | 14 ++++++--------
airflow/providers/microsoft/azure/secrets/key_vault.py | 14 ++++++--------
3 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/airflow/providers/google/cloud/hooks/gcs.py
b/airflow/providers/google/cloud/hooks/gcs.py
index d8bb36037f..1a74d09d55 100644
--- a/airflow/providers/google/cloud/hooks/gcs.py
+++ b/airflow/providers/google/cloud/hooks/gcs.py
@@ -45,6 +45,7 @@ from airflow.exceptions import AirflowException,
AirflowProviderDeprecationWarni
from airflow.providers.google.cloud.utils.helpers import
normalize_directory_path
from airflow.providers.google.common.consts import CLIENT_INFO
from airflow.providers.google.common.hooks.base_google import
GoogleBaseAsyncHook, GoogleBaseHook
+from airflow.typing_compat import ParamSpec
from airflow.utils import timezone
from airflow.version import version
@@ -54,14 +55,6 @@ if TYPE_CHECKING:
from aiohttp import ClientSession
from google.api_core.retry import Retry
-try:
- # Airflow 2.3 doesn't have this yet
- from airflow.typing_compat import ParamSpec
-except ImportError:
- try:
- from typing import ParamSpec # type: ignore[no-redef, attr-defined]
- except ImportError:
- from typing_extensions import ParamSpec
RT = TypeVar("RT")
T = TypeVar("T", bound=Callable)
diff --git a/airflow/providers/google/cloud/secrets/secret_manager.py
b/airflow/providers/google/cloud/secrets/secret_manager.py
index fd8b8e33e2..a40c6bfbe5 100644
--- a/airflow/providers/google/cloud/secrets/secret_manager.py
+++ b/airflow/providers/google/cloud/secrets/secret_manager.py
@@ -28,7 +28,6 @@ from
airflow.providers.google.cloud._internal_client.secret_manager_client impor
from airflow.providers.google.cloud.utils.credentials_provider import
get_credentials_and_project_id
from airflow.secrets import BaseSecretsBackend
from airflow.utils.log.logging_mixin import LoggingMixin
-from airflow.version import version as airflow_version
log = logging.getLogger(__name__)
@@ -154,13 +153,12 @@ class CloudSecretManagerBackend(BaseSecretsBackend,
LoggingMixin):
:param conn_id: the connection id
:return: deserialized Connection
"""
- if _parse_version(airflow_version) >= (2, 3):
- warnings.warn(
- f"Method `{self.__class__.__name__}.get_conn_uri` is
deprecated and will be removed "
- "in a future release. Please use method `get_conn_value`
instead.",
- AirflowProviderDeprecationWarning,
- stacklevel=2,
- )
+ warnings.warn(
+ f"Method `{self.__class__.__name__}.get_conn_uri` is deprecated
and will be removed "
+ "in a future release. Please use method `get_conn_value`
instead.",
+ AirflowProviderDeprecationWarning,
+ stacklevel=2,
+ )
return self.get_conn_value(conn_id)
def get_variable(self, key: str) -> str | None:
diff --git a/airflow/providers/microsoft/azure/secrets/key_vault.py
b/airflow/providers/microsoft/azure/secrets/key_vault.py
index 794788206c..bfa9117b11 100644
--- a/airflow/providers/microsoft/azure/secrets/key_vault.py
+++ b/airflow/providers/microsoft/azure/secrets/key_vault.py
@@ -38,7 +38,6 @@ from airflow.exceptions import
AirflowProviderDeprecationWarning
from airflow.providers.microsoft.azure.utils import
get_sync_default_azure_credential
from airflow.secrets import BaseSecretsBackend
from airflow.utils.log.logging_mixin import LoggingMixin
-from airflow.version import version as airflow_version
def _parse_version(val):
@@ -170,13 +169,12 @@ class AzureKeyVaultBackend(BaseSecretsBackend,
LoggingMixin):
:param conn_id: the connection id
:return: deserialized Connection
"""
- if _parse_version(airflow_version) >= (2, 3):
- warnings.warn(
- f"Method `{self.__class__.__name__}.get_conn_uri` is
deprecated and will be removed "
- "in a future release. Please use method `get_conn_value`
instead.",
- AirflowProviderDeprecationWarning,
- stacklevel=2,
- )
+ warnings.warn(
+ f"Method `{self.__class__.__name__}.get_conn_uri` is deprecated
and will be removed "
+ "in a future release. Please use method `get_conn_value`
instead.",
+ AirflowProviderDeprecationWarning,
+ stacklevel=2,
+ )
return self.get_conn_value(conn_id)
def get_variable(self, key: str) -> str | None:
