datedict 0.1.1__tar.gz → 0.1.2__tar.gz

{datedict-0.1.1 → datedict-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datedict
-Version: 0.1.1
+Version: 0.1.2
 Summary: DateDict and YearDict: date-aware dictionary structures
 Project-URL: Homepage, https://github.com/you/datedict
 Project-URL: Issues, https://github.com/you/datedict/issues

{datedict-0.1.1 → datedict-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "datedict"
-version = "0.1.1"
+version = "0.1.2"
 description = "DateDict and YearDict: date-aware dictionary structures"
 readme = "README.md"
 requires-python = ">=3.10"

{datedict-0.1.1 → datedict-0.1.2}/src/datedict/DateDict.py

@@ -3,7 +3,7 @@ from decimal import Decimal
 
 from datetime import timedelta
 
-from .common import _to_decimal, _Z
+from .common import ZERO
 
 
 class DateDict:
@@ -65,7 +65,7 @@ class DateDict:
         If a value is None, it is treated as zero.
         """
         return Decimal(
-            sum(value if value is not None else _Z for value in self.data.values())
+            sum(value if value is not None else ZERO for value in self.data.values())
         )
 
     def __add__(self, other: "Decimal | DateDict") -> "DateDict":
@@ -79,7 +79,7 @@ class DateDict:
         else:
             return DateDict(
                 {
-                    k: ((v + (other.data.get(k) or _Z) if v is not None else None))
+                    k: ((v + (other.data.get(k) or ZERO) if v is not None else None))
                     for k, v in self.data.items()
                 }
             )
@@ -95,7 +95,7 @@ class DateDict:
         elif isinstance(other, DateDict):
             return DateDict(
                 {
-                    k: ((v * (other.data.get(k) or _Z) if v is not None else None))
+                    k: ((v * (other.data.get(k) or ZERO) if v is not None else None))
                     for k, v in self.data.items()
                 }
             )
@@ -114,7 +114,7 @@ class DateDict:
         elif isinstance(other, DateDict):
             return DateDict(
                 {
-                    k: ((v / (other.data.get(k) or _Z) if v is not None else None))
+                    k: ((v / (other.data.get(k) or ZERO) if v is not None else None))
                     for k, v in self.data.items()
                 }
             )
@@ -133,5 +133,5 @@ class DateDict:
         """
         valid_values = [v for v in self.data.values() if v is not None]
         if not valid_values:
-            return _Z
+            return ZERO
         return Decimal(sum(valid_values)) / len(valid_values)

{datedict-0.1.1 → datedict-0.1.2}/src/datedict/YearDict.py

@@ -1,20 +1,27 @@
 from decimal import Decimal
 
-from .common import _to_decimal, _Z
+from .common import to_decimal, ZERO
 
 
 class YearDict:
-    def __init__(self, start_year=2025, end_year=2025, initial_value: Decimal | int | float = _Z):
+    def __init__(
+        self,
+        start_year=2025,
+        end_year=2025,
+        initial_value: Decimal | int | float = ZERO,
+    ):
         self.start_year: int = start_year
         self.end_year: int = end_year
-        iv: Decimal = _to_decimal(initial_value)
-        self.data: dict[int, Decimal] = {y: iv for y in range(self.start_year, self.end_year + 1)}
+        iv: Decimal = to_decimal(initial_value)
+        self.data: dict[int, Decimal] = {
+            y: iv for y in range(self.start_year, self.end_year + 1)
+        }
 
     def __getitem__(self, year: int) -> Decimal:
         return self.data[year]
 
     def __setitem__(self, year: int, value):
-        self.data[int(year)] = _to_decimal(value)
+        self.data[int(year)] = to_decimal(value)
 
     def override(self, data: dict[int, Decimal | float | int | str]) -> "YearDict":
         if not data:
@@ -25,22 +32,22 @@ class YearDict:
             raise ValueError("Data must cover all years in the contiguous range.")
         self.start_year, self.end_year = ys[0], ys[-1]  # inclusive
         self.data = {
-            y: _to_decimal(data[y]) for y in range(self.start_year, self.end_year + 1)
+            y: to_decimal(data[y]) for y in range(self.start_year, self.end_year + 1)
         }
         return self
 
-    def fit(self, start_year: int, end_year: int, initial_value: Decimal = _Z):
+    def fit(self, start_year: int, end_year: int, initial_value: Decimal = ZERO):
         self.start_year, self.end_year = int(start_year), int(end_year)
-        iv = _to_decimal(initial_value)
+        iv = to_decimal(initial_value)
         self.data = {
-            y: _to_decimal(self.data[y]) if y in self.data else iv
+            y: to_decimal(self.data[y]) if y in self.data else iv
             for y in range(self.start_year, self.end_year + 1)
         }
         return self
 
     def non_negative(self) -> "YearDict":
         out = YearDict(self.start_year, self.end_year)
-        out.data = {y: (v if v >= _Z else _Z) for y, v in self.data.items()}
+        out.data = {y: (v if v >= ZERO else ZERO) for y, v in self.data.items()}
         return out
 
     def sum(
@@ -48,7 +55,7 @@ class YearDict:
     ) -> Decimal:
         sy = self.start_year if start_year is None else int(start_year)
         ey = self.end_year if end_year is None else int(end_year)
-        return sum((self.data[y] for y in range(sy, ey + 1) if y in self.data), _Z)
+        return sum((self.data[y] for y in range(sy, ey + 1) if y in self.data), ZERO)
 
     def __mul__(self, other):
         result = YearDict(self.start_year, self.end_year)

datedict-0.1.2/src/datedict/__init__.py

@@ -0,0 +1,6 @@
+from .DateDict import DateDict
+from .YearDict import YearDict
+from .common import ZERO
+
+__all__ = ["DateDict", "YearDict", "ZERO"]
+__version__ = "0.1.2"

{datedict-0.1.1 → datedict-0.1.2}/src/datedict/common.py

@@ -1,10 +1,10 @@
 from decimal import Decimal
 
 
-_Z = Decimal("0")
+ZERO = Decimal("0")
 
 
-def _to_decimal(x) -> Decimal:
+def to_decimal(x) -> Decimal:
     if isinstance(x, Decimal):
         return x
     if isinstance(x, (int, str)):

datedict-0.1.1/src/datedict/__init__.py

@@ -1,5 +0,0 @@
-from .DateDict import DateDict
-from .YearDict import YearDict
-
-__all__ = ["DateDict", "YearDict"]
-__version__ = "0.1.1"