release

Author: lsbardel

ccy/__init__.py

@@ -1,6 +1,6 @@
 """Python currencies"""
 
-__version__ = "1.7.0"
+__version__ = "1.7.1"
 
 
 from .core.country import (

ccy/core/daycounter.py

@@ -12,6 +12,7 @@
 from copy import copy
 from datetime import date
 from typing import Any
+from ..dates.utils import date_diff
 
 __all__ = ["getdc", "DayCounter", "alldc"]
 
@@ -41,7 +42,7 @@ class DayCounter(metaclass=DayCounterMeta):
 
     def count(self, start: date, end: date) -> float:
         """Count the number of days between 2 dates"""
-        return (end - start).total_seconds() / 86400
+        return date_diff(end, start).total_seconds() / 86400
 
     def dcf(self, start: date, end: date) -> float:
         return self.count(start, end) / 360.0
@@ -76,5 +77,5 @@ def dcf(self, start: date, end: date) -> float:
     def act_act_years(self, dt: date) -> float:
         y = dt.year
         days_in_year = 365 if y % 4 else 366
-        dd = (dt - date(y, 1, 1)).total_seconds() / 86400
+        dd = date_diff(dt, date(y, 1, 1)).total_seconds() / 86400
         return y + dd / days_in_year

ccy/dates/utils.py

@@ -0,0 +1,20 @@
+from datetime import date, datetime, timezone, timedelta
+
+
+def utcnow() -> datetime:
+    return datetime.now(timezone.utc)
+
+
+def as_utc(dt: date | None = None) -> datetime:
+    if dt is None:
+        return utcnow()
+    elif isinstance(dt, datetime):
+        return dt.astimezone(timezone.utc)
+    else:
+        return datetime(dt.year, dt.month, dt.day, tzinfo=timezone.utc)
+
+
+def date_diff(a: date, b: date) -> timedelta:
+    if isinstance(a, datetime) or isinstance(b, datetime):
+        return as_utc(a) - as_utc(b)
+    return a - b

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ccy"
-version = "1.7.0"
+version = "1.7.1"
 description = "Python currencies"
 authors = ["Luca Sbardella <[email protected]>"]
 license = "BSD"

tests/test_dc.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+from ccy.dates.utils import utcnow
 import ccy
 
 
@@ -18,3 +19,14 @@ def test_getdb():
 
     with pytest.raises(KeyError):
         ccy.getdc("kaputt")
+
+
+def test_with_datetime():
+    for name in ("ACT/365", "ACT/ACT", "ACT/360"):
+        dc = ccy.getdc(name)
+        start = utcnow()
+        dc1 = dc.dcf(start, start.date() + timedelta(days=1))
+        dc2 = dc.dcf(start, start + timedelta(days=1))
+        assert dc1 > 0
+        assert dc2 > 0
+        assert dc1 < dc2, f"{name}"