PyPI - owlplanner - Versions diffs - 2025.2.20__tar.gz → 2025.2.21__tar.gz - Mend

@@ -0,0 +1,56 @@
+"Plan Name" = "Jon+Jane"
+["Basic Info"]
+Status = "married"
+Names = [ "Jon", "Jane",]
+"Birth year" = [ 1965, 1968,]
+"Life expectancy" = [ 92, 92,]
+"Start date" = "01-01"
+[Assets]
+"taxable savings balances" = [ 50.0, 0.0,]
+"tax-deferred savings balances" = [ 900.0, 500.0,]
+"tax-free savings balances" = [ 0.0, 0.0,]
+"Beneficiary fractions" = [ 1.0, 1.0, 1.0,]
+"Spousal surplus deposit fraction" = 0.0
+["Wages and Contributions"]
+"Contributions file name" = "edited values"
+["Fixed Income"]
+"Pension amounts" = [ 0.0, 0.0,]
+"Pension ages" = [ 65, 65,]
+"Pension indexed" = [ false, false,]
+"Social security amounts" = [ 21.0, 21.0,]
+"Social security ages" = [ 65, 65,]
+["Rates Selection"]
+"Heirs rate on tax-deferred estate" = 30.0
+"Long-term capital gain tax rate" = 15.0
+"Dividend tax rate" = 2.0
+"TCJA expiration year" = 2026
+Method = "user"
+Values = [ 10.0, 0.0, 0.0, 3.5000000000000004,]
+From = 1928
+To = 2024
+["Asset Allocation"]
+"Interpolation method" = "linear"
+"Interpolation center" = 15.0
+"Interpolation width" = 5.0
+Type = "individual"
+generic = [ [ [ 100, 0, 0, 0,], [ 100, 0, 0, 0,],], [ [ 100, 0, 0, 0,], [ 100, 0, 0, 0,],],]
+["Optimization Parameters"]
+"Spending profile" = "flat"
+"Surviving spouse spending percent" = 60
+Objective = "maxSpending"
+["Solver Options"]
+maxRothConversion = 0.0
+noRothConversions = "None"
+withMedicare = true
+bequest = 30.0
+[Results]
+"Default plots" = "today"

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

@@ -607,8 +607,7 @@ add the market returns to the savings balances.
 	if needed due to RMDs or receiving large sums of money,
 	could be made at the end of the year. Let's formulate this approach
 	in more detail and investigate for potential problems.
-	Timing controls which terms get multiplied by the rate of return $(1 + \tau_{kn})$
-	for a particular asset $k$.
+	Timing controls which terms get multiplied by the rate of return $(1 + \mathcal{T}_{ijn})$.
 	Therefore, our current choice would yield
 	\begin{eqnarray}
 		\label{Eq:C3a}

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

@@ -180,7 +180,7 @@ def readConfig(file, *, verbose=True, logstreams=None, readContributions=True):
     # status = diconf['Basic Info']['Status']
     yobs = diconf["Basic Info"]["Birth year"]
     expectancy = diconf["Basic Info"]["Life expectancy"]
-    startDate = diconf["Basic Info"]["Start date"]
+    startDate = diconf["Basic Info"].get("Start date", "today")
     icount = len(yobs)
     s = ["", "s"][icount - 1]
     mylog.vprint(f"Plan for {icount} individual{s}: {inames}.")
@@ -295,6 +295,11 @@ def readConfig(file, *, verbose=True, logstreams=None, readContributions=True):
     # Solver Options.
     p.solverOptions = diconf["Solver Options"]
+    # Check consistency of noRothConversions.
+    name = p.solverOptions.get("noRothConversions", "None")
+    if name != "None" and name not in p.inames:
+        raise ValueError(f"Unknown name {name} for noRothConversions.")
     # Results.
     p.setDefaultPlots(diconf["Results"]["Default plots"])

@@ -2895,7 +2895,7 @@ def _stackPlot(x, inames, title, irange, series, snames, location, yformat="\\$k
     if len(nonzeroSeries) == 0:
         # print('Nothing to plot for', title)
-        return None
+        return None, None
     fig, ax = plt.subplots(figsize=(6, 4))
     plt.grid(visible="both")

@@ -422,7 +422,8 @@ def plotSingleResults(plan):
         st.write("##### Assets Distribution")
         morecols = st.columns(3, gap="small")
         for fig in figs:
-            morecols[c].pyplot(fig)
+            if fig is not None:
+                morecols[c].pyplot(fig)
             c = (c + 1) % 3

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

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

owlplanner 2025.2.20__tar.gz → 2025.2.21__tar.gz