owlplanner 2025.2.15__tar.gz → 2025.2.19__tar.gz

{owlplanner-2025.2.15 → owlplanner-2025.2.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.2.15
+Version: 2025.2.19
 Summary: Owl: Retirement planner with great wisdom
 Project-URL: HomePage, https://github.com/mdlacasse/owl
 Project-URL: Repository, https://github.com/mdlacasse/owl

{owlplanner-2025.2.15 → owlplanner-2025.2.19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "owlplanner"
-version = "2025.02.15"
+version = "2025.02.19"
 authors = [
   { name="Martin-D. Lacasse", email="martin.d.lacasse@gmail.com" },
 ]

{owlplanner-2025.2.15 → owlplanner-2025.2.19}/src/owlplanner/plan.py

@@ -306,10 +306,8 @@ class Plan(object):
             endyear = thisyear + self.horizons[i] - 1
             self.mylog.vprint(f"{self.inames[i]:>14}: life horizon from {thisyear} -> {endyear}.")
 
-        # Prepare income tax and RMD time series.
+        # Prepare RMD time series.
         self.rho_in = tx.rho_in(self.yobs, self.N_n)
-        self.sigma_n, self.theta_tn, self.Delta_tn = tx.taxParams(self.yobs, self.i_d, self.n_d,
-                                                                  self.N_n, self.yTCJA)
 
         # If none was given, default is to begin plan on today's date.
         self._setStartingDate(startDate)
@@ -452,6 +450,7 @@ class Plan(object):
         self.mylog.vprint(f"Setting TCJA expiration year to {yTCJA}.")
         self.yTCJA = yTCJA
         self.caseStatus = "modified"
+        self._adjustedParameters = False
 
     def setLongTermCapitalTaxRate(self, psi):
         """
@@ -990,9 +989,11 @@ class Plan(object):
 
         if not self._adjustedParameters:
             self.mylog.vprint("Adjusting parameters for inflation.")
+            self.sigma_n, self.theta_tn, self.Delta_tn = tx.taxParams(self.yobs, self.i_d, self.n_d,
+                                                                      self.N_n, self.yTCJA)
+            self.sigmaBar_n = self.sigma_n * self.gamma_n[:-1]
             self.DeltaBar_tn = self.Delta_tn * self.gamma_n[:-1]
             self.zetaBar_in = self.zeta_in * self.gamma_n[:-1]
-            self.sigmaBar_n = self.sigma_n * self.gamma_n[:-1]
             self.xiBar_n = self.xi_n * self.gamma_n[:-1]
             self.piBar_in = self.pi_in
             for i in range(self.N_i):

owlplanner-2025.2.19/src/owlplanner/version.py

@@ -0,0 +1 @@
+__version__ = "2025.02.19"

{owlplanner-2025.2.15 → owlplanner-2025.2.19}/tests/test_repro.py

@@ -36,7 +36,7 @@ def test_case1():
     p = createJackAndJillPlan('case1')
     p.setRates('historical', 1969)
     p.solve('maxSpending', options={'maxRothConversion': 100, 'bequest': 500})
-    assert p.basis == pytest.approx(81918.4, abs=0.5)
+    assert p.basis == pytest.approx(81978.0, abs=0.5)
     assert p.bequest == pytest.approx(500000, abs=0.5)
 
 
@@ -45,7 +45,7 @@ def test_case2():
     p.setRates('historical', 1969)
     p.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p.basis == pytest.approx(80000, abs=0.5)
-    assert p.bequest == pytest.approx(592543, abs=0.5)
+    assert p.bequest == pytest.approx(595407.5, abs=0.5)
 
 
 def test_config1():
@@ -54,7 +54,7 @@ def test_config1():
     p.setRates('historical', 1969)
     p.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p.basis == pytest.approx(80000, abs=0.5)
-    assert p.bequest == pytest.approx(592543, abs=0.5)
+    assert p.bequest == pytest.approx(595407.5, abs=0.5)
     p.saveConfig()
     base_filename = 'case_' + name
     full_filename = 'case_' + name + '.toml'
@@ -62,11 +62,11 @@ def test_config1():
     p2 = owl.readConfig(base_filename)
     p2.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p2.basis == pytest.approx(80000, abs=0.5)
-    assert p2.bequest == pytest.approx(592543, abs=0.5)
+    assert p2.bequest == pytest.approx(595407.5, abs=0.5)
     p3 = owl.readConfig(full_filename)
     p3.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p3.basis == pytest.approx(80000, abs=0.5)
-    assert p3.bequest == pytest.approx(592543, abs=0.5)
+    assert p3.bequest == pytest.approx(595407.5, abs=0.5)
     os.remove(full_filename)
 
 
@@ -76,14 +76,14 @@ def test_config2():
     p.setRates('historical', 1969)
     p.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p.basis == pytest.approx(80000, abs=0.5)
-    assert p.bequest == pytest.approx(592543, abs=0.5)
+    assert p.bequest == pytest.approx(595407.5, abs=0.5)
     iostring = StringIO()
     p.saveConfig(iostring)
     # print('iostream:', iostream.getvalue())
     p2 = owl.readConfig(iostring)
     p2.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p2.basis == pytest.approx(80000, abs=0.5)
-    assert p2.bequest == pytest.approx(592543, abs=0.5)
+    assert p2.bequest == pytest.approx(595407.5, abs=0.5)
 
 
 def test_clone1():
@@ -92,12 +92,12 @@ def test_clone1():
     p.setRates('historical', 1969)
     p.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p.basis == pytest.approx(80000, abs=0.5)
-    assert p.bequest == pytest.approx(592543, abs=0.5)
+    assert p.bequest == pytest.approx(595407.5, abs=0.5)
     name2 = 'testclone2'
     p2 = owl.clone(p, name2)
     p2.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p2.basis == pytest.approx(80000, abs=0.5)
-    assert p2.bequest == pytest.approx(592543, abs=0.5)
+    assert p2.bequest == pytest.approx(595407.5, abs=0.5)
 
 
 def test_clone2():
@@ -105,10 +105,10 @@ def test_clone2():
     p = createJackAndJillPlan(name)
     p.setRates('historical', 1969)
     p.solve('maxSpending', options={'maxRothConversion': 100, 'bequest': 0})
-    assert p.basis == pytest.approx(92258, abs=0.5)
+    assert p.basis == pytest.approx(92317.5, abs=0.5)
     assert p.bequest == pytest.approx(0, abs=0.5)
     name2 = 'testclone2'
     p2 = owl.clone(p, name2)
     p2.solve('maxSpending', options={'maxRothConversion': 100, 'bequest': 0})
-    assert p2.basis == pytest.approx(92258, abs=0.5)
+    assert p2.basis == pytest.approx(92317.5, abs=0.5)
     assert p2.bequest == pytest.approx(0, abs=0.5)

{owlplanner-2025.2.15 → owlplanner-2025.2.19}/ui/Rates_Selection.py

@@ -210,23 +210,24 @@ else:
 
     st.divider()
     st.write("### Other rates")
-    col1, col2 = st.columns(2, gap="large", vertical_alignment="top")
+    col1, col2, col3 = st.columns(3, gap="large", vertical_alignment="top")
     with col1:
         kz.initKey("divRate", 2)
         helpmsg = "Average annual (qualified) dividend return rate on stock portfolio for income tax purposes."
         ret = kz.getNum("Dividend rate (%)", "divRate", max_value=100.0, format="%.2f", help=helpmsg, step=1.0)
 
     st.write("#### Income taxes")
-    col1, col2 = st.columns(2, gap="large", vertical_alignment="top")
+    col1, col2, col3 = st.columns(3, gap="large", vertical_alignment="top")
     with col1:
         kz.initKey("gainTx", 15)
         ret = kz.getNum("Long-term capital gains tax rate (%)", "gainTx", max_value=100.0, step=1.0)
 
-        kz.initKey("yTCJA", 2026)
-        helpmsg = "Year at which the Tax Cut And Job Act tax rates are speculated to expire."
-        ret = kz.getIntNum("TCJA expiration year", "yTCJA", help=helpmsg)
-
     with col2:
         kz.initKey("heirsTx", 30)
         helpmsg = "Marginal tax rate that heirs would have to pay on inherited tax-deferred balance."
         ret = kz.getNum("Heirs marginal tax rate (%)", "heirsTx", max_value=100.0, help=helpmsg, step=1.0)
+
+    with col3:
+        kz.initKey("yTCJA", 2026)
+        helpmsg = "Year at which the Tax Cut And Job Act tax rates are speculated to expire."
+        ret = kz.getIntNum("TCJA expiration year", "yTCJA", help=helpmsg)

{owlplanner-2025.2.15 → owlplanner-2025.2.19}/ui/requirements.txt

@@ -7,4 +7,4 @@ scipy
 streamlit
 toml
 # --extra-index-url https://test.pypi.org/simple
-owlplanner >= 2025.02.15
+owlplanner >= 2025.02.19

owlplanner-2025.2.15/src/owlplanner/version.py

@@ -1 +0,0 @@
-__version__ = "2025.02.15"