Skip to content

Commit

Permalink
Fix k8s tests (#69)
Browse files Browse the repository at this point in the history
(cherry picked from commit 027fa0d)
(cherry picked from commit e0c7db7)
  • Loading branch information
kaxil committed Dec 31, 2019
1 parent 06f19c9 commit e2e20ca
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion airflow/contrib/kubernetes/istio.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@
from airflow import AirflowException
from airflow.utils.log.logging_mixin import LoggingMixin
from kubernetes.stream import stream
from packaging.version import parse as semantic_version
try:
from packaging.version import parse as semantic_version
except ImportError:
# Python 2
from distutils.version import LooseVersion as semantic_version


class SidecarNames:
Expand Down
2 changes: 1 addition & 1 deletion tests/kubernetes/test_istio.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from airflow.contrib.kubernetes.istio import Istio

import unittest
from unittest.mock import MagicMock, patch
from tests.compat import MagicMock, patch


def mock_stream(func, *args, **kwargs):
Expand Down

0 comments on commit e2e20ca

Please sign in to comment.