glidepath 1.0.2__tar.gz → 1.1.1__tar.gz

{glidepath-1.0.2 → glidepath-1.1.1}/LICENSE-DATA

@@ -1,8 +1,8 @@
 Data licence notice
 ===================
 
-Everything in this repository is MIT-licensed (see LICENSE) EXCEPT the
-following bundled data file:
+Glidepath's own code is MIT-licensed (see LICENSE). The following bundled
+data file has a separate licence:
 
     src/glidepath/regions/uk/data/returns_history.toml
 
@@ -26,3 +26,6 @@ The MIT licence grant does not extend to that file. To obtain a
 distribution free of CC BY-NC-SA material, delete the file and
 regenerate a replacement from a source of your choosing with
 scripts/build_returns_history.py as a starting point.
+
+Third-party runtime licences and notices in third-party-licences/ retain
+their original terms; Glidepath's MIT licence does not replace them.

{glidepath-1.0.2 → glidepath-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: glidepath
-Version: 1.0.2
+Version: 1.1.1
 Summary: Desktop retirement and investment planner (UK-first, region-extensible).
 Keywords: retirement,pension,financial-planning,investment,uk,sipp,isa,monte-carlo
 Author: James Williams
@@ -24,6 +24,7 @@ Project-URL: Homepage, https://williajm.github.io/glidepath/
 Project-URL: Repository, https://github.com/williajm/glidepath
 Project-URL: Changelog, https://github.com/williajm/glidepath/blob/main/CHANGELOG.md
 Project-URL: Issues, https://github.com/williajm/glidepath/issues
+Project-URL: Statistics, https://pyrank.org/package/glidepath/
 Description-Content-Type: text/markdown
 
 <!-- Image and badge URLs are absolute so the README renders on PyPI,
@@ -45,6 +46,7 @@ Description-Content-Type: text/markdown
 
 <p align="center">
   <a href="https://williajm.github.io/glidepath/"><b>williajm.github.io/glidepath</b></a>
+  · <a href="https://pyrank.org/package/glidepath/">PyPI and GitHub stats on PyRank</a>
 </p>
 
 A desktop retirement and investment planner. UK-first, built so other
@@ -132,7 +134,32 @@ based solely on this tool.
 
 ## Install
 
-Glidepath is installed from [PyPI](https://pypi.org/project/glidepath/)
+### Windows download
+
+From **v1.1.0**, Windows x64 users can run Glidepath without Python, uv
+or terminal commands:
+
+1. Open the [latest GitHub Release](https://github.com/williajm/glidepath/releases/latest).
+2. Under **Assets**, download `glidepath-X.Y.Z-windows-x64.exe`.
+3. Keep it in a folder of your choice and double-click it to launch.
+
+This is a runnable app, not an installer; it does not add shortcuts or
+update itself. For a newer version, close Glidepath and download the new
+executable. Your saved `.glidepath.json` plans stay where you put them.
+
+The executable is **not yet signed with a Windows publisher certificate**.
+Windows may show “Windows protected your PC” or “unrecognised app”. Check
+that the file came from this repository's release before deciding whether
+to proceed. GitHub build provenance does not remove that warning.
+If the latest release has no `.exe` yet, use the uv installation below.
+
+Runtime licences and attribution notices are included in the executable
+and in the release's `glidepath-X.Y.Z-third-party-licences.zip` download.
+That archive also lists the corresponding upstream sources.
+
+### Install with uv
+
+Alternatively, install Glidepath from [PyPI](https://pypi.org/project/glidepath/)
 with [uv](https://docs.astral.sh/uv/), which also fetches the Python it
 needs — you do not need Python installed first.
 
@@ -238,14 +265,24 @@ Releases are `vX.Y.Z` tags on `main`. Each one is published to
 trusted publishing with PEP 740 attestations, and as a GitHub Release
 carrying its notes from
 [`CHANGELOG.md`](https://github.com/williajm/glidepath/blob/main/CHANGELOG.md)
-with the same artifacts attached, each carrying signed build
+with the same Python artifacts and a tested Windows x64 executable attached,
+each carrying signed build
 provenance — verify a downloaded file with
 `gh attestation verify <file> -R williajm/glidepath`. The signed
 provenance bundle is attached to each release too
 (`glidepath-X.Y.Z-provenance.intoto.jsonl`), so verification also
-works offline with `--bundle`. There are no
-packaged binary builds (installer/exe) yet — install from PyPI as
-above.
+works offline with `--bundle`.
+
+From v1.1.0, the tag-triggered workflow also builds
+`glidepath-X.Y.Z-windows-x64.exe` with Nuitka. Download it from the
+GitHub Release and double-click to run; Python and uv are not required.
+The Windows build runs only for release tags, after tag validation, and
+must pass its compiled-app checks before publication. Ordinary branch
+pushes and PRs run the normal CI checks without compiling an executable.
+The executable is not yet Authenticode-signed, so Windows may show a
+SmartScreen warning; the build provenance above is a separate mechanism.
+See [`docs/packaging.md`](https://github.com/williajm/glidepath/blob/main/docs/packaging.md)
+for local builds and the release workflow.
 
 ## Data licences
 

{glidepath-1.0.2 → glidepath-1.1.1}/README.md

@@ -17,6 +17,7 @@
 
 <p align="center">
   <a href="https://williajm.github.io/glidepath/"><b>williajm.github.io/glidepath</b></a>
+  · <a href="https://pyrank.org/package/glidepath/">PyPI and GitHub stats on PyRank</a>
 </p>
 
 A desktop retirement and investment planner. UK-first, built so other
@@ -104,7 +105,32 @@ based solely on this tool.
 
 ## Install
 
-Glidepath is installed from [PyPI](https://pypi.org/project/glidepath/)
+### Windows download
+
+From **v1.1.0**, Windows x64 users can run Glidepath without Python, uv
+or terminal commands:
+
+1. Open the [latest GitHub Release](https://github.com/williajm/glidepath/releases/latest).
+2. Under **Assets**, download `glidepath-X.Y.Z-windows-x64.exe`.
+3. Keep it in a folder of your choice and double-click it to launch.
+
+This is a runnable app, not an installer; it does not add shortcuts or
+update itself. For a newer version, close Glidepath and download the new
+executable. Your saved `.glidepath.json` plans stay where you put them.
+
+The executable is **not yet signed with a Windows publisher certificate**.
+Windows may show “Windows protected your PC” or “unrecognised app”. Check
+that the file came from this repository's release before deciding whether
+to proceed. GitHub build provenance does not remove that warning.
+If the latest release has no `.exe` yet, use the uv installation below.
+
+Runtime licences and attribution notices are included in the executable
+and in the release's `glidepath-X.Y.Z-third-party-licences.zip` download.
+That archive also lists the corresponding upstream sources.
+
+### Install with uv
+
+Alternatively, install Glidepath from [PyPI](https://pypi.org/project/glidepath/)
 with [uv](https://docs.astral.sh/uv/), which also fetches the Python it
 needs — you do not need Python installed first.
 
@@ -210,14 +236,24 @@ Releases are `vX.Y.Z` tags on `main`. Each one is published to
 trusted publishing with PEP 740 attestations, and as a GitHub Release
 carrying its notes from
 [`CHANGELOG.md`](https://github.com/williajm/glidepath/blob/main/CHANGELOG.md)
-with the same artifacts attached, each carrying signed build
+with the same Python artifacts and a tested Windows x64 executable attached,
+each carrying signed build
 provenance — verify a downloaded file with
 `gh attestation verify <file> -R williajm/glidepath`. The signed
 provenance bundle is attached to each release too
 (`glidepath-X.Y.Z-provenance.intoto.jsonl`), so verification also
-works offline with `--bundle`. There are no
-packaged binary builds (installer/exe) yet — install from PyPI as
-above.
+works offline with `--bundle`.
+
+From v1.1.0, the tag-triggered workflow also builds
+`glidepath-X.Y.Z-windows-x64.exe` with Nuitka. Download it from the
+GitHub Release and double-click to run; Python and uv are not required.
+The Windows build runs only for release tags, after tag validation, and
+must pass its compiled-app checks before publication. Ordinary branch
+pushes and PRs run the normal CI checks without compiling an executable.
+The executable is not yet Authenticode-signed, so Windows may show a
+SmartScreen warning; the build provenance above is a separate mechanism.
+See [`docs/packaging.md`](https://github.com/williajm/glidepath/blob/main/docs/packaging.md)
+for local builds and the release workflow.
 
 ## Data licences
 

{glidepath-1.0.2 → glidepath-1.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "glidepath"
-version = "1.0.2"
+version = "1.1.1"
 description = "Desktop retirement and investment planner (UK-first, region-extensible)."
 readme = "README.md"
 # MIT code plus one CC BY-NC-SA 4.0 data file (returns_history.toml —
@@ -49,11 +49,18 @@ Homepage = "https://williajm.github.io/glidepath/"
 Repository = "https://github.com/williajm/glidepath"
 Changelog = "https://github.com/williajm/glidepath/blob/main/CHANGELOG.md"
 Issues = "https://github.com/williajm/glidepath/issues"
+Statistics = "https://pyrank.org/package/glidepath/"
 
 [project.gui-scripts]
 glidepath = "glidepath.gui.main:main"
 
 [dependency-groups]
+binary = [
+    "nuitka>=4.2",
+    "setuptools>=84",
+    "wheel>=0.48",
+    "zstandard",
+]
 dev = [
     "hypothesis",
     "mypy",
@@ -70,11 +77,36 @@ dev = [
 requires = ["uv_build>=0.11,<0.13"]
 build-backend = "uv_build"
 
+# Shared by the local build command and the tagged release workflow.
+[tool.glidepath.binary]
+windows-icon = "src/glidepath/gui/assets/glidepath.ico"
+# Dependency Walker 2.2.6000 (2006), required by Nuitka on Windows x64.
+# Build tool only: never included in the distributed application.
+dependency-walker-url = "https://dependencywalker.com/depends22_x64.zip"
+dependency-walker-sha256 = "35db68a613874a2e8c1422eb0ea7861f825fc71717d46dabf1f249ce9634b4f1"
+nuitka-options = [
+    "--update-check=never",
+    "--enable-plugin=pyside6",
+    "--include-qt-plugins=platforms,imageformats",
+    "--include-package-data=glidepath",
+    "--include-distribution-metadata=glidepath",
+    "--include-data-files=LICENSE=LICENSE",
+    "--include-data-files=LICENSE-DATA=LICENSE-DATA",
+    "--include-data-dir=third-party-licences=third-party-licences",
+    "--product-name=Glidepath",
+    "--file-description=Glidepath retirement planner",
+    "--company-name=James Williams",
+]
+
 # --- uv ---------------------------------------------------------------------
 [tool.uv]
 # Supply-chain cooldown: resolution ignores anything published to PyPI after
 # this timestamp (now minus 7 days). Updated ONLY by `make deps`.
-exclude-newer = "2026-08-19T15:28:17Z"
+exclude-newer = "2026-08-29T16:19:47Z"
+# Nuitka is source-only. uv installs its build requirements from the binary
+# group first, then builds it in that environment: the lockfile hashes, age
+# check and all-groups audit cover the exact setuptools/wheel versions used.
+no-build-isolation-package = ["nuitka"]
 
 # PyPI is the ONLY permitted index (supply-chain policy; see CLAUDE.md).
 [[tool.uv.index]]

{glidepath-1.0.2 → glidepath-1.1.1}/src/glidepath/app/files.py

@@ -60,7 +60,7 @@ SAVE_DIALOG_TITLE: Final = "Save plan"
 UNSAVED_CHANGES_TITLE: Final = "Unsaved changes"
 
 UNSAVED_CHANGES_PROMPT: Final = (
-    "This plan has unsaved changes. Save them before closing?"
+    "This plan has unsaved changes. Save them before continuing?"
 )
 
 NOTHING_TO_SAVE_MESSAGE: Final = (

{glidepath-1.0.2 → glidepath-1.1.1}/src/glidepath/core/retirement.py

@@ -11,11 +11,14 @@ candidate: the returned age is exactly the earliest succeeding one
 even when success is not monotone in age (a DB scheme's early-payment
 factors or a dated outflow can make it dip), and every answer was
 actually probed, never interpolated. Household spending begins once
-*every* person has retired (planning §4.11), so a candidate has a
+every living person has retired (planning §4.11), so a candidate has a
 retired period to test the income in only when the whole household —
 the candidate age for the selected person, the partner's stated
 decision held fixed — is retired inside the run's horizon; a
-candidate without one fails rather than succeeding vacuously.
+candidate without one fails rather than succeeding vacuously. Death
+uses the engine's period-start gate: at least one person must remain
+alive, and a deceased partner's retirement age no longer constrains
+the survivor's spending.
 
 Each probe replaces the *selected* person's retirement-age decision
 with the candidate — a partner's decision is held fixed (planning
@@ -142,11 +145,9 @@ def earliest_retirement_age(  # noqa: PLR0913
     returns the first that succeeds — exactly the earliest, whatever
     the success shape over ages (module docstring) — or ``None`` when
     no age in the bracket does. A candidate with no *retirement
-    exposure* — no projected period opening the whole household
-    retired under the §4.1 gate convention (household spending starts
-    once every person has retired, §4.11), because the candidate's or
-    a partner's fixed retirement date falls at or past the run's
-    horizon — never tests the target income at all, so it fails
+    exposure* — no projected period opening with at least one living
+    person and all living persons retired under the §4.1 gate
+    convention — never tests the target income at all, so it fails
     rather than succeeding vacuously; such candidates are never
     probed. The plan's stated retirement age and spending level are
     irrelevant to the search: each probe carries the candidate age and
@@ -168,7 +169,7 @@ def earliest_retirement_age(  # noqa: PLR0913
     periods = _projected_periods(plan, assumptions, region, config)
 
     def has_retired_period(age: int) -> bool:
-        """Whether any period opens the whole household retired (§4.1)."""
+        """Whether any period opens a living household retired (§4.1)."""
         return any(
             _household_retired_by(period, plan.persons, selected.id, age)
             for period in periods
@@ -227,12 +228,11 @@ def sustainable_income_at_age(  # noqa: PLR0913
     age and the candidate spending instead, everything else unchanged.
 
     An ``age`` with no *retirement exposure* — no projected period
-    opening the whole household retired under the §4.1 gate convention
-    (household spending starts once every person has retired, §4.11),
-    because the chosen or a partner's fixed retirement date falls at
-    or past the run's horizon — has no retired period to test any
-    income in: spending is modelled only in retirement, so every level
-    would succeed vacuously. It answers ``None`` without probing,
+    opening with at least one living person and all living persons
+    retired under the §4.1 gate convention — has no retired period to
+    test any income in: spending is modelled only in a living
+    household's retirement, so every level would succeed vacuously.
+    It answers ``None`` without probing,
     exactly as such candidates fail in the age search. ``None``
     otherwise means what the income search means by it: not even zero
     spending survives the plan's outflows.
@@ -303,21 +303,31 @@ def _household_retired_by(
     selected_id: EntityId,
     age: int,
 ) -> bool:
-    """Whether every person opens ``period`` retired (§4.1, §4.11).
+    """Whether a living household opens ``period`` retired (§4.1, §4.11).
 
     The exposure predicate of both solvers: the selected person
     retires at the probed ``age`` while a partner's stated
-    retirement-age decision is held fixed — matching the engine, where
-    household spending begins once every person has retired, so only
-    such a period can test a retirement income at all.
+    retirement-age decision is held fixed. Match the engine's death
+    gate: a person is no longer living once their death age has been
+    attained by the period start. Spending begins once all living
+    persons retire and stops when none remain, so only such a period
+    can test retirement income.
     """
-    return all(
+    living = tuple(
+        person
+        for person in persons
+        if person.death_age is None
+        or not is_age_attained_by_period_start(
+            person.date_of_birth.value, person.death_age.value, period
+        )
+    )
+    return bool(living) and all(
         is_age_attained_by_period_start(
             person.date_of_birth.value,
             age if person.id == selected_id else person.target_retirement_age.value,
             period,
         )
-        for person in persons
+        for person in living
     )
 
 

{glidepath-1.0.2 → glidepath-1.1.1}/src/glidepath/gui/forms.py

@@ -393,7 +393,7 @@ class FactsEntryPane(QWidget):
         self,
         view_model: FactsFormViewModel,
         on_submit: Callable[[FactsFormData], FactsSubmissionOutcome],
-        on_clear: Callable[[], str],
+        on_clear: Callable[[], str | None],
         parent: QWidget | None = None,
     ) -> None:
         """Render the form and wire the submit and clear callbacks."""
@@ -754,10 +754,13 @@ class FactsEntryPane(QWidget):
         self._show_errors(outcome.errors)
 
     def clear(self) -> None:
-        """Empty every section, then show the clear callback's status."""
+        """Empty every section only when the callback allows the clear."""
+        status = self._on_clear()
+        if status is None:
+            return
         self._clear_all_errors()
         self.set_form_data(FactsFormData())
-        self.status_label.setText(self._on_clear())
+        self.status_label.setText(status)
 
 
 __all__ = [

{glidepath-1.0.2 → glidepath-1.1.1}/src/glidepath/gui/widgets.py

@@ -381,6 +381,8 @@ class MainWindow(QMainWindow):
         starts from what the file says. On failure the session is left
         untouched and the status bar explains.
         """
+        if not self._confirm_plan_replacement():
+            return False
         outcome = load_plan_state(path, today=_today())
         self.statusBar().showMessage(outcome.message)
         if outcome.state is None:
@@ -545,17 +547,21 @@ class MainWindow(QMainWindow):
             self._remember_plan_path(path)
 
     def closeEvent(self, event: QCloseEvent) -> None:  # noqa: N802
-        """Ask before a close discards unsaved plan edits (issue #136).
+        """Close only after unsaved plan edits have been dealt with."""
+        if self._confirm_plan_replacement():
+            event.accept()
+        else:
+            event.ignore()
+
+    def _confirm_plan_replacement(self) -> bool:
+        """Ask before closing, opening, or clearing discards plan edits.
 
         Save runs the normal save flow — asking for a path when the
-        session has none — and the window closes only once the changes
-        are actually saved: a failed or cancelled save keeps it open
-        rather than silently discarding the edits it just promised to
-        keep.
+        session has none. A failed or cancelled save abandons the
+        pending action and preserves the session and form.
         """
         if not has_unsaved_changes(self._state):
-            event.accept()
-            return
+            return True
         choice = QMessageBox.question(
             self,
             UNSAVED_CHANGES_TITLE,
@@ -567,15 +573,8 @@ class MainWindow(QMainWindow):
         )
         if choice == QMessageBox.StandardButton.Save:
             self.save_plan()
-            if has_unsaved_changes(self._state):
-                event.ignore()
-                return
-            event.accept()
-            return
-        if choice == QMessageBox.StandardButton.Discard:
-            event.accept()
-            return
-        event.ignore()
+            return not has_unsaved_changes(self._state)
+        return choice == QMessageBox.StandardButton.Discard
 
     def _remember_plan_path(self, path: Path) -> None:
         """Record the plan path for the next launch, best-effort.
@@ -611,13 +610,15 @@ class MainWindow(QMainWindow):
         self._state = state_marked_saved(self._state)
         self.facts_pane.status_label.setText(self._view_model.facts_form.example_note)
 
-    def _handle_cleared(self) -> str:
+    def _handle_cleared(self) -> str | None:
         """Reset the session to no plan and re-render the result panes.
 
         The session's plan file detaches too: after a clear, the next
         Save asks where to write rather than overwriting the file the
         cleared plan came from.
         """
+        if not self._confirm_plan_replacement():
+            return None
         self._state = initial_plan_state()
         self._plan_path = None
         self._refresh_result_panes()