From cd70638af034bbb7c11510beca98cfcd5e794d7c Mon Sep 17 00:00:00 2001 From: Andrey Anshin Date: Thu, 21 Mar 2024 16:58:32 +0400 Subject: [PATCH] Remove redundant usage of `importlib_metadata` for distribution versions --- airflow/providers/docker/hooks/docker.py | 8 ++------ tests/providers/docker/hooks/test_docker.py | 8 +------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/airflow/providers/docker/hooks/docker.py b/airflow/providers/docker/hooks/docker.py index 18ccfd7689ba9e..9e91b723af8068 100644 --- a/airflow/providers/docker/hooks/docker.py +++ b/airflow/providers/docker/hooks/docker.py @@ -18,7 +18,6 @@ from __future__ import annotations import json -import sys import warnings from functools import cached_property from typing import TYPE_CHECKING, Any @@ -105,12 +104,9 @@ def construct_tls_config( :param ssl_version: Version of SSL to use when communicating with docker daemon. """ if ca_cert and client_cert and client_key: - from packaging.version import Version + from importlib.metadata import version - if sys.version_info >= (3, 9): - from importlib.metadata import version - else: - from importlib_metadata import version + from packaging.version import Version tls_config = { "ca_cert": ca_cert, diff --git a/tests/providers/docker/hooks/test_docker.py b/tests/providers/docker/hooks/test_docker.py index 758ab7b808db86..6f64e32d7984a5 100644 --- a/tests/providers/docker/hooks/test_docker.py +++ b/tests/providers/docker/hooks/test_docker.py @@ -19,8 +19,8 @@ import logging import ssl -import sys import warnings +from importlib.metadata import version from unittest import mock import pytest @@ -31,12 +31,6 @@ from airflow.exceptions import AirflowException, AirflowNotFoundException from airflow.providers.docker.hooks.docker import DockerHook -if sys.version_info >= (3, 9): - from importlib.metadata import version -else: - from importlib_metadata import version - - DOCKER_PY_7_PLUS = Version(Version(version("docker")).base_version) >= Version("7") TEST_CONN_ID = "docker_test_connection"