Test: Migrated from uing pytz to using zoneinfo/tzdata

Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>
pywbem · Jun 8, 2024 · d053749 · d053749
1 parent f372a2f
commit d053749
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 42 deletions.
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -99,6 +99,9 @@ Released: not yet
 * Document the input parameters for the integer cim types (Uint8, etc.)
   including the use of 'x' as either a keyword or positional input parameter.
 
+* Test: Migrated from 'pytz' to 'zoneinfo'/'tzdata' for the tests that use it.
+  (issue #3191)
+
 **Known issues:**
 
 * See `list of open issues`_.

diff --git a/minimum-constraints-develop.txt b/minimum-constraints-develop.txt
@@ -36,8 +36,10 @@ yagot==0.5.0
 
 importlib-metadata==4.8.3
 
-pytz==2016.10; python_version <= '3.9'
-pytz==2019.1; python_version >= '3.10'
+# zoneinfo is part of Python starting with Python 3.9
+backports.zoneinfo==0.2.1; python_version == '3.8'
+# tzdata is needed by zoneinfo on systems with no timezone database (e.g. Windows)
+tzdata==2024.1; sys_platform == 'win32'
 
 # Unit test (indirect dependencies):
 pluggy==0.13.0

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -44,9 +44,10 @@ yagot>=0.5.0
 
 importlib-metadata>=4.8.3
 
-# pytz before 2019.1 fails on Python 3.10 because it uses collections.Mapping
-pytz>=2016.10; python_version <= '3.9'
-pytz>=2019.1; python_version >= '3.10'
+# zoneinfo is part of Python starting with Python 3.9
+backports.zoneinfo>=0.2.1; python_version == '3.8'
+# tzdata is needed by zoneinfo on systems with no timezone database (e.g. Windows)
+tzdata>=2024.1; sys_platform == 'win32'
 
 # Unit test (indirect dependencies):
 

diff --git a/tests/unittest/pywbem/test_cim_types.py b/tests/unittest/pywbem/test_cim_types.py
@@ -7,7 +7,10 @@
 import re
 from datetime import timedelta, datetime
 
-import pytz
+try:
+    import zoneinfo
+except ImportError:
+    from backports import zoneinfo
 import pytest
 
 from ..utils.pytest_extensions import simplified_test_function
@@ -1021,24 +1024,14 @@ def test_MinutesFromUTC_init(testcase, args, kwargs, exp_offset):
         None, None, True
     ),
     (
-        "Test with UTC offset 150 and datetime with tzinfo for EST (ignored)",
+        "Test with UTC offset 150 and datetime with tzinfo",
         dict(
             offset=150,
-            dt=datetime.now(pytz.timezone('US/Eastern')),
+            dt=datetime.now(tz=zoneinfo.ZoneInfo('US/Eastern')),
             exp_utc_offset=150,
         ),
         None, None, True
     ),
-    (
-        "Test with UTC offset -150 and datetime with tzinfo for EDT (ignored)",
-        dict(
-            offset=-150,
-            dt=pytz.timezone('US/Eastern').
-            localize(datetime.now(), is_dst=True),
-            exp_utc_offset=-150,
-        ),
-        None, None, True
-    ),
 ]
 
 
@@ -1097,20 +1090,10 @@ def test_MinutesFromUTC_utcoffset(testcase, offset, dt, exp_utc_offset):
         None, None, True
     ),
     (
-        "Test with UTC offset 150 and datetime with tzinfo for EST (ignored)",
+        "Test with UTC offset 150 and datetime with tzinfo",
         dict(
             offset=150,
-            dt=datetime.now(pytz.timezone('US/Eastern')),
-            exp_dst_offset=0,
-        ),
-        None, None, True
-    ),
-    (
-        "Test with UTC offset -150 and datetime with tzinfo for EDT (ignored)",
-        dict(
-            offset=-150,
-            dt=pytz.timezone('US/Eastern').
-            localize(datetime.now(), is_dst=True),
+            dt=datetime.now(tz=zoneinfo.ZoneInfo('US/Eastern')),
             exp_dst_offset=0,
         ),
         None, None, True
@@ -1243,24 +1226,14 @@ def test_MinutesFromUTC_dst(testcase, offset, dt, exp_dst_offset):
         None, None, True
     ),
     (
-        "Test with UTC offset 150 and datetime with tzinfo for EST (ignored)",
+        "Test with UTC offset 150 and datetime with tzinfo",
         dict(
             offset=150,
-            dt=datetime.now(pytz.timezone('US/Eastern')),
+            dt=datetime.now(tz=zoneinfo.ZoneInfo('US/Eastern')),
             exp_tzname='02:30',
         ),
         None, None, True
     ),
-    (
-        "Test with UTC offset -150 and datetime with tzinfo for EDT (ignored)",
-        dict(
-            offset=-150,
-            dt=pytz.timezone('US/Eastern').
-            localize(datetime.now(), is_dst=True),
-            exp_tzname='-02:30',
-        ),
-        None, None, True
-    ),
 ]