Merge pull request #14 from niccokunzmann/issue-13

Switch to zoneinfo

.github/workflows/tests.yml

@@ -15,7 +15,6 @@ jobs:
       matrix:
         config:
         # [Python version, tox env]
-        - ["3.8",   "py38"]
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]

.gitignore

@@ -9,3 +9,4 @@ __pycache__
 ENV2
 *.swp
 .tox
+.venv

README.rst

@@ -215,6 +215,15 @@ how to go about it.
 Changelog
 ---------
 
+- v1.0.0
+
+  - Use `zoneinfo` instead of `pytz`
+  - Test compatibility with `pytz` and `zoneinfo` as argument to `to_standard`
+  - Remove `pytz` as a dependency
+  - Add `tzdata` as a dependency
+  - Add typing
+  - Update Python versions
+
 - v0.0.7
 
   - Rename master branch to main

requirements.txt

@@ -1,2 +1,2 @@
 icalendar
-pytz
+tzdata

setup.py

@@ -11,7 +11,7 @@
 HERE = os.path.abspath(os.path.dirname(__file__))
 sys.path.insert(0, HERE)  # for package import
 
-__version__ = "0.0.7"
+__version__ = "1.0.1"
 __author__ = 'Nicco Kunzmann'
 
 
@@ -128,13 +128,10 @@ def run(self):
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         development_state
         ],
     zip_safe=True,

test-requirements.txt

@@ -2,3 +2,4 @@ pytest
 restructuredtext-lint
 pygments
 icalendar>=5.0.11
+pytz

test/test_convert_examples.py

@@ -1,6 +1,7 @@
 """This test converts example calendars"""
 import pytest
 import x_wr_timezone
+import zoneinfo
 import pytz
 
 
@@ -93,8 +94,10 @@ def test_conversion_adds_the_time_zone(to_standard, calendars, calendar_name, co
 
 @pytest.mark.parametrize("tz,line,message,calendar_name", [
     ("Europe/Paris", ("DTSTART", "TZID=Europe/Paris" ,"20211223T030000"), "(1) Use string as timezone", "single-events-DTSTART-DTEND.in.ics"),
-    (pytz.timezone("Europe/Berlin"), ("DTSTART", "TZID=Europe/Berlin", "20211223T030000"), "(2) Use pytz.timezone as timezone", "single-events-DTSTART-DTEND.in.ics"),
-    (pytz.UTC, ("DTSTART", "20211222T170000Z"), "(3) Use pytz.UTC as timezone", "single-events-DTSTART-DTEND.in.ics"),
+    (zoneinfo.ZoneInfo("Europe/Berlin"), ("DTSTART", "TZID=Europe/Berlin", "20211223T030000"), "(2) Use zoneinfo's timezone as timezone", "single-events-DTSTART-DTEND.in.ics"),
+    (zoneinfo.ZoneInfo("UTC"), ("DTSTART", "20211222T170000Z"), "(3) Use zoninfo's UTC as timezone", "single-events-DTSTART-DTEND.in.ics"),
+    (pytz.timezone("Europe/Berlin"), ("DTSTART", "TZID=Europe/Berlin", "20211223T030000"), "(4) Use pytz.timezone as timezone", "single-events-DTSTART-DTEND.in.ics"),
+    (pytz.UTC, ("DTSTART", "20211222T170000Z"), "(5) Use pytz.UTC as timezone", "single-events-DTSTART-DTEND.in.ics"),
 ])
 def test_timezone_parameter(calendars, tz, line, message, calendar_name):
     calendar = calendars[calendar_name]

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py38, py39, py310, py311
+envlist = py39, py310, py311, py312
 requires = setuptools>=68.2.2
 
 [testenv]

x_wr_timezone.py

@@ -12,10 +12,11 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """Bring calendars using X-WR-TIMEZONE into RFC 5545 form."""
 import sys
-import pytz
+import zoneinfo
 from icalendar.prop import vDDDTypes, vDDDLists
 import datetime
 import icalendar
+from typing import Optional
 
 X_WR_TIMEZONE = "X-WR-TIMEZONE"
 
@@ -140,11 +141,13 @@ def walk_value_datetime(self, dt):
         if self.is_UTC(dt):
             return dt.astimezone(self.new_timezone)
         elif self.is_Floating(dt):
-            return self.new_timezone.localize(dt)
+            if is_pytz(self.new_timezone):
+                return self.new_timezone.localize(dt)
+            return dt.replace(tzinfo=self.new_timezone)
         return dt
 
 
-def to_standard(calendar, timezone=None):
+def to_standard(calendar : icalendar.Calendar, timezone:Optional[datetime.tzinfo]=None) -> icalendar.Calendar:
     """Make a calendar that might use X-WR-TIMEZONE compatible with RFC 5545.
 
     Arguments:
@@ -159,7 +162,7 @@ def to_standard(calendar, timezone=None):
     if timezone is None:
         timezone = calendar.get(X_WR_TIMEZONE, None)
     if timezone is not None and not isinstance(timezone, datetime.tzinfo):
-        timezone = pytz.timezone(timezone)
+        timezone = zoneinfo.ZoneInfo(timezone)
     if timezone is not None:
         walker = UTCChangingWalker(timezone)
         return walker.walk(calendar)