Remove unneccessary pytz dependency

datadog_checks_base/datadog_checks/base/data/agent_requirements.in

@@ -56,7 +56,6 @@ pysocks==1.7.0
 python-binary-memcached==0.26.1; sys_platform != "win32"
 python-dateutil==2.8.0
 python3-gearman==0.1.0; sys_platform != "win32" and python_version > "3.0"
-pytz==2019.3
 pyvmomi==v6.5.0.2017.5-1
 pywin32==228; sys_platform == "win32"
 pyyaml==5.3.1

datadog_checks_base/datadog_checks/base/utils/db/transform.py

@@ -10,7 +10,8 @@
 from ...constants import ServiceCheck
 from .. import constants
 from ..common import compute_percent, total_time_to_temporal_percent
-from .utils import create_extra_transformer, normalize_datetime
+from ..time import ensure_aware_datetime
+from .utils import create_extra_transformer
 
 # Used for the user-defined `expression`s
 ALLOWED_GLOBALS = {
@@ -258,13 +259,13 @@ def get_time_elapsed(transformers, column_name, **modifiers):
     if time_format == 'native':
 
         def time_elapsed(_, value, **kwargs):
-            value = normalize_datetime(value)
+            value = ensure_aware_datetime(value)
             gauge(_, (datetime.now(value.tzinfo) - value).total_seconds(), **kwargs)
 
     else:
 
         def time_elapsed(_, value, **kwargs):
-            value = normalize_datetime(datetime.strptime(value, time_format))
+            value = ensure_aware_datetime(datetime.strptime(value, time_format))
             gauge(_, (datetime.now(value.tzinfo) - value).total_seconds(), **kwargs)
 
     return time_elapsed

datadog_checks_base/datadog_checks/base/utils/db/utils.py

@@ -3,8 +3,6 @@
 # Licensed under a 3-clause BSD style license (see LICENSE)
 from itertools import chain
 
-import pytz
-
 # AgentCheck methods to transformer name e.g. set_metadata -> metadata
 SUBMISSION_METHODS = {
     'gauge': 'gauge',
@@ -54,12 +52,3 @@ def transformer(sources, **kwargs):
         transformer = column_transformer
 
     return transformer
-
-
-def normalize_datetime(dt):
-    # Prevent naive datetime objects
-    if dt.tzinfo is None:
-        # The stdlib datetime.timezone.utc doesn't work properly on Windows
-        dt = dt.replace(tzinfo=pytz.utc)
-
-    return dt

datadog_checks_base/requirements.in

@@ -14,7 +14,6 @@ protobuf==3.7.0
 pyjwt==1.7.1
 pysocks==1.7.0
 python-dateutil==2.8.0
-pytz==2019.3
 pywin32==228; sys_platform == 'win32'
 pyyaml==5.3.1
 requests==2.22.0

datadog_checks_base/tests/test_db.py

@@ -5,11 +5,12 @@
 from datetime import datetime, timedelta
 
 import pytest
-import pytz
+from dateutil.tz import gettz
 
 from datadog_checks.base import AgentCheck
 from datadog_checks.base.stubs.aggregator import AggregatorStub
 from datadog_checks.base.utils.db import QueryManager
+from datadog_checks.base.utils.time import UTC
 
 pytestmark = pytest.mark.db
 
@@ -1524,7 +1525,7 @@ def test_time_elapsed_native(self, aggregator):
                 ],
                 'tags': ['test:bar'],
             },
-            executor=mock_executor([['tag1', datetime.now(pytz.utc) + timedelta(hours=-1)]]),
+            executor=mock_executor([['tag1', datetime.now(UTC) + timedelta(hours=-1)]]),
             tags=['test:foo'],
         )
         query_manager.compile_queries()
@@ -1547,7 +1548,7 @@ def test_time_elapsed_native_default(self, aggregator):
                 'columns': [{'name': 'test', 'type': 'tag'}, {'name': 'test.foo', 'type': 'time_elapsed'}],
                 'tags': ['test:bar'],
             },
-            executor=mock_executor([['tag1', datetime.now(pytz.utc) + timedelta(hours=-1)]]),
+            executor=mock_executor([['tag1', datetime.now(UTC) + timedelta(hours=-1)]]),
             tags=['test:foo'],
         )
         query_manager.compile_queries()
@@ -1574,7 +1575,7 @@ def test_time_elapsed_format(self, aggregator):
                 ],
                 'tags': ['test:bar'],
             },
-            executor=mock_executor([['tag1', (datetime.now(pytz.utc) + timedelta(hours=-1)).strftime(time_format)]]),
+            executor=mock_executor([['tag1', (datetime.now(UTC) + timedelta(hours=-1)).strftime(time_format)]]),
             tags=['test:foo'],
         )
         query_manager.compile_queries()
@@ -1626,7 +1627,7 @@ def test_time_elapsed_datetime_aware(self, aggregator):
                 ],
                 'tags': ['test:bar'],
             },
-            executor=mock_executor([['tag1', datetime.now(pytz.timezone('EST')) + timedelta(hours=-1)]]),
+            executor=mock_executor([['tag1', datetime.now(gettz('EST')) + timedelta(hours=-1)]]),
             tags=['test:foo'],
         )
         query_manager.compile_queries()

rethinkdb/tests/unit/test_utils.py

@@ -1,12 +1,12 @@
 import datetime as dt
 
 import pytest
-import pytz
 
+from datadog_checks.base.utils.time import UTC
 from datadog_checks.rethinkdb.utils import to_time_elapsed
 
 
 def test_to_time_elapsed():
     # type: () -> None
     one_day_seconds = 3600 * 24
-    assert to_time_elapsed(dt.datetime.now(pytz.utc) - dt.timedelta(days=1)) == pytest.approx(one_day_seconds, abs=1)
+    assert to_time_elapsed(dt.datetime.now(UTC) - dt.timedelta(days=1)) == pytest.approx(one_day_seconds, abs=1)