You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by di...@apache.org on 2020/10/30 14:42:03 UTC

[airflow] branch v1-10-test updated: Fix static tests

This is an automated email from the ASF dual-hosted git repository.

dimberman pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/v1-10-test by this push:
     new 800611c  Fix static tests
800611c is described below

commit 800611c02a7fa24e8db9640a21cd83934c56ae3d
Author: Daniel Imberman <da...@gmail.com>
AuthorDate: Fri Oct 30 07:40:39 2020 -0700

    Fix static tests
---
 airflow/kubernetes/pod_generator.py           | 5 +++--
 tests/kubernetes/test_pod_generator.py        | 2 +-
 tests/kubernetes/test_worker_configuration.py | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/airflow/kubernetes/pod_generator.py b/airflow/kubernetes/pod_generator.py
index dbdfcfe..5a57230 100644
--- a/airflow/kubernetes/pod_generator.py
+++ b/airflow/kubernetes/pod_generator.py
@@ -92,7 +92,8 @@ def make_safe_label_value(string):
 
     return safe_label
 
-def datetime_to_label_safe_datestring(datetime_obj: datetime.datetime) -> str:
+
+def datetime_to_label_safe_datestring(datetime_obj):
     """
     Kubernetes doesn't like ":" in labels, since ISO datetime format uses ":" but
     not "_" let's
@@ -104,7 +105,7 @@ def datetime_to_label_safe_datestring(datetime_obj: datetime.datetime) -> str:
     return datetime_obj.isoformat().replace(":", "_").replace('+', '_plus_')
 
 
-def label_safe_datestring_to_datetime(string: str) -> datetime.datetime:
+def label_safe_datestring_to_datetime(string):
     """
     Kubernetes doesn't permit ":" in labels. ISO datetime format uses ":" but not
     "_", let's
diff --git a/tests/kubernetes/test_pod_generator.py b/tests/kubernetes/test_pod_generator.py
index 41b0bc8..9681611 100644
--- a/tests/kubernetes/test_pod_generator.py
+++ b/tests/kubernetes/test_pod_generator.py
@@ -25,7 +25,7 @@ from kubernetes.client import ApiClient, models as k8s
 
 from airflow.kubernetes.k8s_model import append_to_pod
 from airflow.kubernetes.pod import Resources
-from airflow.kubernetes.pod_generator import PodDefaults, PodGenerator, extend_object_field, merge_objcts, \
+from airflow.kubernetes.pod_generator import PodDefaults, PodGenerator, extend_object_field, merge_objects, \
     datetime_to_label_safe_datestring
 from airflow.kubernetes.secret import Secret
 
diff --git a/tests/kubernetes/test_worker_configuration.py b/tests/kubernetes/test_worker_configuration.py
index 32eb53e..82b4f6b 100644
--- a/tests/kubernetes/test_worker_configuration.py
+++ b/tests/kubernetes/test_worker_configuration.py
@@ -18,6 +18,7 @@
 
 import unittest
 import six
+from dateutil import parser
 from parameterized import parameterized
 
 from tests.compat import mock