Merge pull request #774 from Jenselme/remove-pytz

Remove dependency on pytz

CHANGELOG.rst

@@ -3,6 +3,7 @@ Unreleased
 
 * feat: Lowercase the ``null_values`` provided to individual data types, since all comparisons to ``null_values`` are case-insensitive. (#770)
 * feat: :class:`.Mean` works with :class:`.TimeDelta`. (#761)
+* Switch from ``pytz`` to ``ZoneInfo``.
 
 1.7.1 - Jan 4, 2023
 -------------------

agate/data_types/date_time.py

@@ -16,8 +16,7 @@ class DateTime(DataType):
         A formatting string for :meth:`datetime.datetime.strptime` to use
         instead of using regex-based parsing.
     :param timezone:
-        A `pytz <https://pytz.sourceforge.net/>`_ timezone to apply to each
-        parsed date.
+        A ``ZoneInfo`` timezone to apply to each parsed date.
     :param locale:
         A locale specification such as :code:`en_US` or :code:`de_DE` to use
         for parsing formatted datetimes.

docs/cookbook/datetime.rst

@@ -34,9 +34,13 @@ The second way is to specify a timezone as an argument to the type constructor:
 
 .. code-block:: python
 
-    import pytz
+    try:
+        from zoneinfo import ZoneInfo
+    except ImportError:
+        # Fallback for Python < 3.9
+        from backports.zoneinfo import ZoneInfo
 
-    eastern = pytz.timezone('US/Eastern')
+    eastern = ZoneInfo('US/Eastern')
     datetime_type = agate.DateTime(timezone=eastern)
 
 In this case all timezones that are processed will be set to have the Eastern timezone. Note, the timezone will be **set**, not converted. You cannot use this method to convert your timezones from UTC to another timezone. To do that see :ref:`convert_timezones`.
@@ -60,17 +64,21 @@ If you load data from a spreadsheet in one timezone and you need to convert it t
 
 .. code-block:: python
 
-    import pytz
+    try:
+        from zoneinfo import ZoneInfo
+    except ImportError:
+        # Fallback for Python < 3.9
+        from backports.zoneinfo import ZoneInfo
 
-    us_eastern = pytz.timezone('US/Eastern')
+    us_eastern = ZoneInfo('US/Eastern')
     datetime_type = agate.DateTime(timezone=us_eastern)
 
     column_names = ['what', 'when']
     column_types = [text_type, datetime_type]
 
     table = agate.Table.from_csv('events.csv', columns)
 
-    rome = timezone('Europe/Rome')
+    rome = ZoneInfo('Europe/Rome')
     timezone_shifter = agate.Formula(lambda r: r['when'].astimezone(rome))
 
     table = agate.Table.compute([

setup.py

@@ -44,6 +44,7 @@
         'parsedatetime>=2.1,!=2.5',
         'python-slugify>=1.2.1',
         'pytimeparse>=1.1.5',
+        'tzdata>=2023.3;platform_system=="Windows"',
     ],
     extras_require={
         'test': [
@@ -54,7 +55,7 @@
             'PyICU>=2.4.2;sys_platform=="linux"',
             'pytest',
             'pytest-cov',
-            'pytz>=2015.4',
+            'backports.zoneinfo;python_version<"3.9"',
         ],
     }
 )

tests/test_data_types.py

@@ -4,7 +4,12 @@
 from decimal import Decimal
 
 import parsedatetime
-import pytz
+
+try:
+    from zoneinfo import ZoneInfo
+except ImportError:
+    # Fallback for Python < 3.9
+    from backports.zoneinfo import ZoneInfo
 
 from agate.data_types import Boolean, Date, DateTime, Number, Text, TimeDelta
 from agate.exceptions import CastError
@@ -352,16 +357,16 @@ def test_cast_parser(self):
         ))
 
     def test_cast_parser_timezone(self):
-        tzinfo = pytz.timezone('US/Pacific')
+        tzinfo = ZoneInfo('US/Pacific')
         datetime_type = DateTime(timezone=tzinfo)
 
         values = ('3/1/1994 12:30 PM', '2/17/2011 06:30', None, 'January 5th, 1984 22:37', 'n/a')
         casted = tuple(datetime_type.cast(v) for v in values)
         self.assertSequenceEqual(casted, (
-            tzinfo.localize(datetime.datetime(1994, 3, 1, 12, 30, 0, 0)),
-            tzinfo.localize(datetime.datetime(2011, 2, 17, 6, 30, 0, 0)),
+            datetime.datetime(1994, 3, 1, 12, 30, 0, 0, tzinfo=tzinfo),
+            datetime.datetime(2011, 2, 17, 6, 30, 0, 0, tzinfo=tzinfo),
             None,
-            tzinfo.localize(datetime.datetime(1984, 1, 5, 22, 37, 0, 0)),
+            datetime.datetime(1984, 1, 5, 22, 37, 0, 0, tzinfo=tzinfo),
             None
         ))