Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove redundant usage of importlib_metadata for distribution versions #38368

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Remove redundant usage of importlib_metadata for distribution versions #38368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions airflow/providers/docker/hooks/docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 1 addition & 7 deletions tests/providers/docker/hooks/test_docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import logging
import ssl
import sys
import warnings
from importlib.metadata import version
from unittest import mock

import pytest
Expand All @@ -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"
Expand Down
Loading