Remove pytz from dependencies (#43)

pyefergy/__init__.py

@@ -4,14 +4,14 @@
 from __future__ import annotations
 
 from asyncio.exceptions import TimeoutError as timeouterr
-from datetime import datetime
+from datetime import datetime, timedelta
+from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 import logging
-from typing import Any
+from typing import Any, cast
 
 from aiohttp import ClientSession, ClientTimeout
 from aiohttp.client_exceptions import ClientConnectorError, ServerDisconnectedError
 import iso4217
-from pytz import all_timezones, timezone as tz
 
 from . import exceptions
 
@@ -109,14 +109,15 @@ def update_params(
                     break
             if CURRENCY not in self.info:
                 raise exceptions.InvalidCurrency("Provided currency is invalid")
-        if UTC_OFFSET in kwargs:
-            if (utc_offset := kwargs[UTC_OFFSET]) in all_timezones:
-                utc_offset = int(datetime.now(tz(utc_offset)).strftime("%z"))
-                self._utc_offset = -(int(utc_offset / 100 * 60))
-            elif utc_offset.isnumeric():
-                self._utc_offset = utc_offset
-            else:
-                raise exceptions.InvalidOffset("Provided offset is invalid")
+        if (offset := kwargs.get(UTC_OFFSET, "")) and offset.isnumeric():
+            self._utc_offset = offset
+            return
+        try:
+            z_info = ZoneInfo(offset)
+        except ZoneInfoNotFoundError as ex:
+            raise exceptions.InvalidOffset("Provided offset is invalid") from ex
+        utc_offset = cast(timedelta, z_info.utcoffset(datetime.now())).total_seconds()
+        self._utc_offset = -int(utc_offset // 60)
 
     async def _async_req(
         self, command: str, params: dict[str, str | int | float] | None = None

pyproject.toml

@@ -46,7 +46,6 @@ include = ["pyefergy/py.typed"]
 python = ">=3.8,<4"
 aiohttp = ">=3.6.1"
 iso4217 = ">=1.2.20150619"
-pytz = ">=2024.1"
 types-pytz = ">=2021.3.1"
 codecov = "^2.1.13"
 

tests/conftest.py

@@ -2,13 +2,14 @@
 
 # pylint:disable=redefined-outer-name
 import asyncio
+from asyncio import AbstractEventLoop
+import json
+import pathlib
 
-import pytest
 from aresponses.main import ResponsesMockServer as Server
+import pytest
+
 from pyefergy import Efergy
-import json
-import pathlib
-from asyncio import AbstractEventLoop
 
 API_KEY = "ur1234567-0abc12de3f456gh7ij89k012"
 HOST = "engage.efergy.com"

tests/test_init.py

@@ -1,7 +1,10 @@
 """Tests for PyEfergy object models."""
 
 # pylint:disable=protected-access, too-many-lines, line-too-long
+from datetime import datetime
+
 from aiohttp.client import ClientSession
+from freezegun.api import FrozenDateTimeFactory
 import pytest
 
 import pyefergy
@@ -18,9 +21,9 @@ async def test_loop() -> None:
 
 
 @pytest.mark.asyncio
-@pytest.mark.freeze_time("2022-01-03 00:00:00+00:00")
-async def test_init(connection: None) -> None:
+async def test_init(connection: None, freezer: FrozenDateTimeFactory) -> None:
     """Test init."""
+    freezer.move_to(datetime(2022, 1, 3))
     client = Efergy(API_KEY, utc_offset="America/New_York", currency="USD")
 
     assert client._utc_offset == 300