rangekeeper 0.7.2.post2__tar.gz → 0.7.2.post4__tar.gz

{rangekeeper-0.7.2.post2 → rangekeeper-0.7.2.post4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Rangekeeper
-Version: 0.7.2.post2
+Version: 0.7.2.post4
 Summary: A Python library assisting financial modelling in real estate asset & development planning, decision-making, cashflow forecasting, and scenario analysis.
 License: MPL-2.0
 Author: Daniel Fink
@@ -18,7 +18,7 @@ Requires-Dist: multiprocess (>=0.70,<0.71)
 Requires-Dist: networkx (>=3.3,<4.0)
 Requires-Dist: numba (>=0.60,<0.61)
 Requires-Dist: numpy-financial (>=1.0,<2.0)
-Requires-Dist: pandas (>=2.2,<3.0)
+Requires-Dist: pandas (>=2,<3)
 Requires-Dist: pint (>=0.24,<0.25)
 Requires-Dist: plotly (>=5.22,<6.0)
 Requires-Dist: py-moneyed (>=3.0,<4.0)

{rangekeeper-0.7.2.post2 → rangekeeper-0.7.2.post4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "Rangekeeper"
-version = "0.7.2-2"
+version = "0.7.2-4"
 description = "A Python library assisting financial modelling in real estate asset & development planning, decision-making, cashflow forecasting, and scenario analysis."
 authors = ["Daniel Fink <danfink@mit.edu>"]
 license = "MPL-2.0"
@@ -9,7 +9,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = ">=3.10, <3.13"
 matplotlib = "^3.9"
-pandas = "^2.2"
+pandas = "^2"
 pint = "^0.24"
 pyxirr = "^0.10"
 scipy = "^1.13"

{rangekeeper-0.7.2.post2 → rangekeeper-0.7.2.post4}/rangekeeper/duration.py

@@ -11,41 +11,43 @@ import pandas as pd
 
 
 class Type(enum.Enum):
-    DECADE = '10YE'
-    SEMIDECADE = '5YE'
-    BIENNIUM = '2YE'
-    YEAR = 'YE'
-    SEMIYEAR = '6ME'
-    QUARTER = 'QE'
-    MONTH = 'ME'
-    SEMIMONTH = 'SME'
+    DECADE = '10Y'
+    SEMIDECADE = '5Y'
+    BIENNIUM = '2Y'
+    YEAR = 'Y'
+    SEMIYEAR = '6M'
+    QUARTER = 'Q'
+    MONTH = 'M'
+    SEMIMONTH = 'SM'
     WEEK = 'W'
     DAY = 'D'
 
-    @staticmethod
+    @staticmethod # Possibly dealing with pandas > 2.2 changes
     def from_value(value: str):
-        if value == '10YE':
+        if value == '10Y':
             return Type.DECADE
-        if value == '5YE':
+        if value == '5Y':
             return Type.SEMIDECADE
-        if value == '2YE':
+        if value == '2Y':
             return Type.BIENNIUM
-        if value == 'YE':
+        if value == 'Y' or value == 'Y-DEC' or value == 'A-DEC':
             return Type.YEAR
-        if value == '6ME':
+        if value == '6M':
             return Type.SEMIYEAR
-        if value == 'QE':
+        if value == 'Q':
             return Type.QUARTER
-        if value == 'ME':
+        if value == 'M':
             return Type.MONTH
-        if value == 'SME':
+        if value == 'SM':
             return Type.SEMIMONTH
-        if value == 'W':
+        if value == 'W-SUN' or value == 'W':
             return Type.WEEK
         if value == 'D':
             return Type.DAY
+        else:
+            raise ValueError('Unsupported period type: {0}'.format(value))
 
-    @staticmethod
+    @staticmethod # Possibly dealing with pandas > 2.2 changes
     def period(type: Type):
         if type == Type.DECADE:
             return '10Y'
@@ -67,6 +69,8 @@ class Type(enum.Enum):
             return 'W'
         if type == Type.DAY:
             return 'D'
+        else:
+            raise ValueError('Unsupported period type: {0}'.format(type))
 
 
 def measure(

{rangekeeper-0.7.2.post2 → rangekeeper-0.7.2.post4}/rangekeeper/flux.py

@@ -296,7 +296,7 @@ class Flow:
         Returns a Flow with movements summed to specified frequency of dates
         """
         return rk.flux.Flow(
-            movements=self.movements.copy(deep=True).resample(rule=frequency.value).sum(),
+            movements=self.movements.copy(deep=True).resample(rule=rk.duration.Type.period(frequency)).sum(),
             units=self.units,
             name=self.name)
 

{rangekeeper-0.7.2.post2 → rangekeeper-0.7.2.post4}/rangekeeper/projection.py

@@ -99,7 +99,7 @@ class Extrapolation(Projection):
 
         sequence = rk.duration.Sequence.from_bounds(
             include_start=self.bounds[0].to_timestamp(),
-            frequency=rk.duration.Type.from_value(self.sequence.freq),
+            frequency=rk.duration.Type.from_value(self.sequence.freqstr),
             bound=self.bounds[1].to_timestamp())
 
         index = rk.duration.Sequence.to_datestamps(sequence=sequence)
@@ -162,7 +162,7 @@ class Distribution(Projection):
             index=rk.duration.Sequence.to_datestamps(
                 rk.duration.Sequence.from_bounds(
                     include_start=self.bounds[0].to_timestamp(),
-                    frequency=rk.duration.Type.from_value(self.sequence.freq),
+                    frequency=rk.duration.Type.from_value(self.sequence.freqstr),
                     bound=self.bounds[1].to_timestamp())))
 
     def cumulative_density(self) -> [float]: