owlplanner 2025.4.1__tar.gz → 2025.4.2__tar.gz

{owlplanner-2025.4.1 → owlplanner-2025.4.2}/.flake8

@@ -1,6 +1,6 @@
 [flake8]
 max-line-length = 120
-max-complexity = 60
+max-complexity = 70
 # These checks violate PEP8 so let's ignore them
 extend-ignore = E203
 # extend-exclude = */site-packages/*

{owlplanner-2025.4.1 → owlplanner-2025.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.4.1
+Version: 2025.4.2
 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.4.1 → owlplanner-2025.4.2}/pyproject.toml

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

{owlplanner-2025.4.1 → owlplanner-2025.4.2}/src/owlplanner/plan.py

@@ -1122,16 +1122,17 @@ class Plan(object):
             B.set0_Ub(_q1(Ce, n, Nn), self.sigmaBar_n[n])
 
         # Roth conversions equalities/inequalities.
-        if "maxRothConversion" in options:
-            if options["maxRothConversion"] == "file":
-                # self.mylog.vprint(f"Fixing Roth conversions to those from file {self.timeListsFileName}.")
-                for i in range(Ni):
-                    for n in range(self.horizons[i]):
-                        rhs = self.myRothX_in[i][n]
-                        B.setRange(_q2(Cx, i, n, Ni, Nn), rhs, rhs)
-            else:
+        # This condition supercedes everything else.
+        if "maxRothConversion" in options and options["maxRothConversion"] == "file":
+            # self.mylog.vprint(f"Fixing Roth conversions to those from file {self.timeListsFileName}.")
+            for i in range(Ni):
+                for n in range(self.horizons[i]):
+                    rhs = self.myRothX_in[i][n]
+                    B.setRange(_q2(Cx, i, n, Ni, Nn), rhs, rhs)
+        else:
+            if "maxRothConversion" in options:
                 rhsopt = options["maxRothConversion"]
-                assert isinstance(rhsopt, (int, float)), "Specified maxConversion is not a number."
+                assert isinstance(rhsopt, (int, float)), "Specified maxRothConversion is not a number."
                 rhsopt *= units
                 if rhsopt < 0:
                     # self.mylog.vprint('Unlimited Roth conversions (<0)')
@@ -1143,27 +1144,28 @@ class Plan(object):
                             #  Should we adjust Roth conversion cap with inflation?
                             B.set0_Ub(_q2(Cx, i, n, Ni, Nn), rhsopt)
 
-        # Process startRothConversions option.
-        if "startRothConversions" in options:
-            rhsopt = options["startRothConversions"]
-            thisyear = date.today().year
-            yearn = max(rhsopt - thisyear, 0)
+            # Process startRothConversions option.
+            if "startRothConversions" in options:
+                rhsopt = options["startRothConversions"]
+                assert isinstance(rhsopt, (int, float)), "Specified startRothConversions is not a number."
+                thisyear = date.today().year
+                yearn = max(rhsopt - thisyear, 0)
 
-            for i in range(Ni):
-                nstart = min(yearn, self.horizons[i])
-                for n in range(0, nstart):
-                    B.set0_Ub(_q2(Cx, i, n, Ni, Nn), zero)
-
-        # Process noRothConversions option. Also valid when N_i == 1, why not?
-        if "noRothConversions" in options and options["noRothConversions"] != "None":
-            rhsopt = options["noRothConversions"]
-            try:
-                i_x = self.inames.index(rhsopt)
-            except ValueError:
-                raise ValueError(f"Unknown individual {rhsopt} for noRothConversions:")
+                for i in range(Ni):
+                    nstart = min(yearn, self.horizons[i])
+                    for n in range(0, nstart):
+                        B.set0_Ub(_q2(Cx, i, n, Ni, Nn), zero)
+
+            # Process noRothConversions option. Also valid when N_i == 1, why not?
+            if "noRothConversions" in options and options["noRothConversions"] != "None":
+                rhsopt = options["noRothConversions"]
+                try:
+                    i_x = self.inames.index(rhsopt)
+                except ValueError:
+                    raise ValueError(f"Unknown individual {rhsopt} for noRothConversions:")
 
-            for n in range(Nn):
-                B.set0_Ub(_q2(Cx, i_x, n, Ni, Nn), zero)
+                for n in range(Nn):
+                    B.set0_Ub(_q2(Cx, i_x, n, Ni, Nn), zero)
 
         # Impose withdrawal limits on taxable and tax-exempt accounts.
         for i in range(Ni):

owlplanner-2025.4.2/src/owlplanner/version.py

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

{owlplanner-2025.4.1 → owlplanner-2025.4.2}/ui/Documentation.py

@@ -282,6 +282,8 @@ button is toggled, in which case Roth conversions will not be optimized,
 but will rather be performed according to
 the `Roth conv` column on the
 [Wages and Contributions](#wages-and-contributions) page.
+A year from which Roth conversions can begin to be considered can also be selected: no Roth
+conversions will be allowed before the year specified.
 
 Calculations of Medicare and IRMAA can be turned on or off. This will typically speed up
 the calculations by a factor of 2 to 3, which can be useful when running Monte Carlo simulations.

{owlplanner-2025.4.1 → owlplanner-2025.4.2}/ui/Optimization_Parameters.py

@@ -57,7 +57,7 @@ else:
         helpmsg = "Do not perform Roth conversions before that year."
         thisyear = date.today().year
         kz.initKey("startRothConversions", thisyear)
-        ret = kz.getIntNum("Year to start Roth conversions", "startRothConversions", min_value=thisyear,
+        ret = kz.getIntNum("Year to start considering Roth conversions", "startRothConversions", min_value=thisyear,
                            disabled=fromFile, help=helpmsg)
         if kz.getKey("status") == "married":
             iname1 = kz.getKey("iname1")

{owlplanner-2025.4.1 → owlplanner-2025.4.2}/ui/requirements.txt

@@ -8,4 +8,4 @@ scipy
 streamlit
 toml
 # --extra-index-url https://test.pypi.org/simple
-owlplanner >= 2025.04.01
+owlplanner >= 2025.04.02

owlplanner-2025.4.1/src/owlplanner/version.py

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