gea-program 0.66.0__tar.gz → 0.66.1__tar.gz

{gea_program-0.66.0/gea_program.egg-info → gea_program-0.66.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gea-program
-Version: 0.66.0
+Version: 0.66.1
 Summary: GEA-Program: downhole gauge monitoring - canonical measurement records, quality rules, drift evaluation with a re-fit change log, well-test validation, alarm management, model cards, store-and-forward, monthly SLA measurement, FAT/SAT protocols and a dashboard, generated from live objects in the client's reporting outline.
 Author: Daniel T. Murphy
 License: MPL-2.0
@@ -1426,7 +1426,7 @@ attaches the zips to the GitHub release of that tag.
 
 ### The Windows installer
 
-Every release also carries `GEA-Program-Setup-0.66.0.exe` (for 0.66.0): the
+Every release also carries `GEA-Program-Setup-0.66.1.exe` (for 0.66.1): the
 same Windows kit installed like any Windows program, for the signed-in user
 alone and with no administrator rights (`%LOCALAPPDATA%\Programs\GEA-Program`).
 It asks for the site workspace (an existing one such as `C:\site` is used as
@@ -1443,7 +1443,7 @@ it, removes the program and leaves the workspace. Silent, for a site's
 software deployment:
 
 ```
-GEA-Program-Setup-0.66.0.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /WORKSPACE="C:\site" /SITENAME="Pad 3" /TASKS="desktopicon"
+GEA-Program-Setup-0.66.1.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /WORKSPACE="C:\site" /SITENAME="Pad 3" /TASKS="desktopicon"
 ```
 
 The setup is built by Inno Setup 6 from `tools/installer.iss` in the same

{gea_program-0.66.0 → gea_program-0.66.1}/README.md

@@ -1387,7 +1387,7 @@ attaches the zips to the GitHub release of that tag.
 
 ### The Windows installer
 
-Every release also carries `GEA-Program-Setup-0.66.0.exe` (for 0.66.0): the
+Every release also carries `GEA-Program-Setup-0.66.1.exe` (for 0.66.1): the
 same Windows kit installed like any Windows program, for the signed-in user
 alone and with no administrator rights (`%LOCALAPPDATA%\Programs\GEA-Program`).
 It asks for the site workspace (an existing one such as `C:\site` is used as
@@ -1404,7 +1404,7 @@ it, removes the program and leaves the workspace. Silent, for a site's
 software deployment:
 
 ```
-GEA-Program-Setup-0.66.0.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /WORKSPACE="C:\site" /SITENAME="Pad 3" /TASKS="desktopicon"
+GEA-Program-Setup-0.66.1.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /WORKSPACE="C:\site" /SITENAME="Pad 3" /TASKS="desktopicon"
 ```
 
 The setup is built by Inno Setup 6 from `tools/installer.iss` in the same

{gea_program-0.66.0 → gea_program-0.66.1}/gea/__init__.py

@@ -123,7 +123,7 @@ from .profile_catalog import (
     read_pangaea_txt,
 )
 
-__version__ = "0.66.0"
+__version__ = "0.66.1"
 __all__ = [
     "aging_rate", "rate_psi_yr", "accuracy_psi",
     "Sensor", "SimulatorConfig", "DownholeEngine",

{gea_program-0.66.0 → gea_program-0.66.1}/gea/acceptance_tests.py

@@ -14679,6 +14679,44 @@ def section_di_site_name(tmp: str) -> None:
        "one audit line per change" + (f" [failed: {', '.join(failed3)}]" if failed3 else ""))
 
 
+def section_dj_shortcut_start(tmp: str) -> None:
+    """Section DJ - the control panel started the way the shortcuts start it: from pythonw.exe, which has no console and
+    no standard handles. The launcher gives the panel's window a console of its own and passes no handles, so the
+    panel's output reaches that console (v0.65.0 and v0.66.0 passed one, Python filled in the others with a pipe nobody
+    read, and the panel stopped at its first line); the build's install test now starts it the same way."""
+    from . import launcher as L
+    pkg = Path(__file__).parent
+    kw_win, kw_posix = L.service_popen_kwargs(True), L.service_popen_kwargs(False)
+    calls = []
+    saved = L.is_windows
+    try:
+        L.is_windows = lambda: True
+        L.start_service(None, str(Path(tmp, "dj site")), 8765, popen=lambda cmd, **kw: calls.append((cmd, kw)))
+    finally:
+        L.is_windows = saved
+    src = (pkg / "launcher.py").read_text(encoding="utf-8")
+    body = src[src.index("def start_service("):src.index("def tray_command(")]
+    c1 = {
+        "no_handles": not ({"stdin", "stdout", "stderr"} & set(kw_win)) and kw_win["creationflags"] & L.CREATE_NEW_CONSOLE
+                      and kw_win["startupinfo"].wShowWindow == L.SW_SHOWMINNOACTIVE and kw_win["startupinfo"].dwFlags & L.STARTF_USESHOWWINDOW,
+        "used": len(calls) == 1 and not ({"stdin", "stdout", "stderr"} & set(calls[0][1])) and calls[0][1].get("env", {}).get("GEA_PORT") == "8765"
+                and "DEVNULL" not in body,
+        "posix": kw_posix.get("start_new_session") is True,
+    }
+    wf = pkg.parent / ".github" / "workflows" / "build-installer.yml"
+    if wf.exists():
+        y = wf.read_text(encoding="utf-8")
+        win = y[y.index("windows-kit:"):y.index("linux-kit:")]
+        c1["ci_like_shortcut"] = win.count("Join-Path $app 'python\\pythonw.exe') -ArgumentList @('-m', 'gea', 'launch', '--background', '--no-tray')") == 2 \
+                                 and "& $py -m gea launch --background" not in win
+    failed = [k for k, v in c1.items() if not v]
+    ok(not failed,
+       "DJ1 the shortcut's start: the launcher (pythonw.exe, no console, no standard handles) starts the control panel in a minimised "
+       "console of its own and passes it no handles, so its output reaches that console - one passed handle made Python give it a pipe "
+       "nobody read, and the panel stopped at its first line before it opened its port (v0.65.0, v0.66.0); the build's install test starts "
+       "it from pythonw.exe, as the shortcuts do" + (f" [failed: {', '.join(failed)}]" if failed else ""))
+
+
 def main() -> int:
     print("GEA-Program - ACCEPTANCE SUITE (the product gate)")
     # a handle a job subprocess still holds at the end must not turn a finished gate into a traceback on Windows:
@@ -14795,6 +14833,7 @@ def main() -> int:
         section_dg_casing_program(tmp)
         section_dh_windows_installer(tmp)
         section_di_site_name(tmp)
+        section_dj_shortcut_start(tmp)
     if _FAILS:
         print(f"[ACCEPTANCE] {len(_FAILS)} FAILURES ({_PASS} passed):")
         for f in _FAILS:

{gea_program-0.66.0 → gea_program-0.66.1}/gea/help/install.md

@@ -2,7 +2,7 @@
 
 > GEA-Program-Setup: the program installed for you like any Windows program - a window of its own, an icon in the notification area, Start-menu and desktop shortcuts, an Add/Remove Programs entry, upgrades in place - with no administrator rights and the site's data left where it is.
 
-**The command**: download the setup from the release on GitHub (`GEA-Program-Setup-0.66.0.exe` for this version) and run it. It installs for you alone, under `%LOCALAPPDATA%\Programs\GEA-Program`, and asks for the site workspace - the folder that holds the wells, reports, records, accounts and keys. An existing one such as `C:\site` is used exactly as it is, its name included; for a new one (by default `%LOCALAPPDATA%\GEA-Program\site`) it also asks the site's name, which heads every report, and makes the workspace with it (left empty, the workspace is named after its folder; an administrator renames the site in Administration's site settings). Then the Start menu's **GEA-Program** (and the desktop shortcut) starts the control panel when it is not running and opens it in a window of its own. A newer setup installs over the older one: it stops the control panel, replaces the program, keeps the workspace and the choices made before. For a site's software deployment: `GEA-Program-Setup-0.66.0.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /WORKSPACE="C:\site" /SITENAME="Pad 3" /TASKS="desktopicon"` (`/SITENAME` names a workspace the setup makes; one that exists keeps its own name). From a terminal: `gea launch` does what the shortcut does, `gea launch --selftest` says what it would do, `gea tray --selftest` checks the icon.
+**The command**: download the setup from the release on GitHub (`GEA-Program-Setup-0.66.1.exe` for this version) and run it. It installs for you alone, under `%LOCALAPPDATA%\Programs\GEA-Program`, and asks for the site workspace - the folder that holds the wells, reports, records, accounts and keys. An existing one such as `C:\site` is used exactly as it is, its name included; for a new one (by default `%LOCALAPPDATA%\GEA-Program\site`) it also asks the site's name, which heads every report, and makes the workspace with it (left empty, the workspace is named after its folder; an administrator renames the site in Administration's site settings). Then the Start menu's **GEA-Program** (and the desktop shortcut) starts the control panel when it is not running and opens it in a window of its own. A newer setup installs over the older one: it stops the control panel, replaces the program, keeps the workspace and the choices made before. For a site's software deployment: `GEA-Program-Setup-0.66.1.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /WORKSPACE="C:\site" /SITENAME="Pad 3" /TASKS="desktopicon"` (`/SITENAME` names a workspace the setup makes; one that exists keeps its own name). From a terminal: `gea launch` does what the shortcut does, `gea launch --selftest` says what it would do, `gea tray --selftest` checks the icon.
 
 **The window**: Microsoft Edge's app window (`msedge --app=`: the control panel with no tabs and no address bar, its own button on the taskbar, signed in as the browser is), else Google Chrome's, else a tab in the default browser. The control panel itself runs in the window titled "GEA - Operations Control Panel", minimised on the taskbar: the window that starts it again when the panel asks for a restart and says why it stopped when it stops. Closing that window stops the panel.
 
@@ -14,7 +14,7 @@
 
 **The number to check**: Add/Remove Programs lists GEA-Program with the version you installed; `gea doctor --workspace C:\site` ends with `nothing blocks serving`; the Start menu's **Verify GEA-Program** runs the acceptance gate from the installation and ends with `[ACCEPTANCE] OK - N checks passed`. The release's build installs, upgrades and uninstalls the setup silently before it is published, with the control panel running, and checks the workspace untouched afterwards.
 
-**Signed**: when the publisher's code-signing certificate is configured for the build, the setup is signed with it (Authenticode, timestamped) and Windows names the publisher; until then it ships unsigned and Windows SmartScreen says "unknown publisher" (More info, then Run anyway). The build's provenance holds either way: `gh attestation verify GEA-Program-Setup-0.66.0.exe -R Daniel8Murphy0007/GEA-Program`. The uninstaller the setup leaves behind is Inno Setup's own and is not signed separately.
+**Signed**: when the publisher's code-signing certificate is configured for the build, the setup is signed with it (Authenticode, timestamped) and Windows names the publisher; until then it ships unsigned and Windows SmartScreen says "unknown publisher" (More info, then Run anyway). The build's provenance holds either way: `gh attestation verify GEA-Program-Setup-0.66.1.exe -R Daniel8Murphy0007/GEA-Program`. The uninstaller the setup leaves behind is Inno Setup's own and is not signed separately.
 
 **What this page will not call a measurement**: the icon's running or stopped is whether the control panel's port answers on this computer, read every three seconds - not whether every patch, job or report behind it is healthy (Home and the Verification page say that).
 

{gea_program-0.66.0 → gea_program-0.66.1}/gea/launcher.py

@@ -292,19 +292,27 @@ def service_command(kit: Optional[Path], ws: str, port: int, executable: Optiona
     return [console_python(executable), '-m', 'gea', 'serve', '--workspace', ws, '--port', str(int(port)), '--no-browser']
 
 
-def _minimised_console() -> dict:
-    if not is_windows():
-        return {'start_new_session': True}
-    si = subprocess.STARTUPINFO()
+def service_popen_kwargs(windows: Optional[bool] = None) -> dict:
+    """How the control panel's window is started. On Windows: a console of its own, minimised, and NO standard
+    handles passed. Passing any of stdin, stdout or stderr makes Python hand the child the parent's other handles
+    too - and the launcher runs under pythonw.exe, which has none, so Python gives the child a pipe nobody reads:
+    the panel's first line of output then fails and it stops before it opens its port (v0.65.0 and v0.66.0: "did
+    not start within 120 seconds" from the Start-menu shortcut, while the build's test, run from a console,
+    passed). With no handles given, the new console's own are used."""
+    windows = is_windows() if windows is None else windows
+    if not windows:
+        return {'start_new_session': True, 'stdin': subprocess.DEVNULL, 'close_fds': True}
+    si_cls = getattr(subprocess, 'STARTUPINFO', None)           # Windows only; a stand-in where the check runs elsewhere
+    si = si_cls() if si_cls else __import__('types').SimpleNamespace(dwFlags=0, wShowWindow=0)
     si.dwFlags |= STARTF_USESHOWWINDOW
     si.wShowWindow = SW_SHOWMINNOACTIVE
-    return {'creationflags': CREATE_NEW_CONSOLE, 'startupinfo': si}
+    return {'creationflags': CREATE_NEW_CONSOLE, 'startupinfo': si, 'close_fds': True}
 
 
 def start_service(kit: Optional[Path], ws: str, port: int, popen: Callable = subprocess.Popen) -> list:
     cmd = service_command(kit, ws, port)
     env = dict(os.environ, GEA_WORKSPACE=ws, GEA_PORT=str(int(port)))
-    popen(cmd, cwd=str(kit) if kit else None, env=env, stdin=subprocess.DEVNULL, close_fds=True, **_minimised_console())
+    popen(cmd, cwd=str(kit) if kit else None, env=env, **service_popen_kwargs())
     return cmd
 
 

{gea_program-0.66.0 → gea_program-0.66.1/gea_program.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gea-program
-Version: 0.66.0
+Version: 0.66.1
 Summary: GEA-Program: downhole gauge monitoring - canonical measurement records, quality rules, drift evaluation with a re-fit change log, well-test validation, alarm management, model cards, store-and-forward, monthly SLA measurement, FAT/SAT protocols and a dashboard, generated from live objects in the client's reporting outline.
 Author: Daniel T. Murphy
 License: MPL-2.0
@@ -1426,7 +1426,7 @@ attaches the zips to the GitHub release of that tag.
 
 ### The Windows installer
 
-Every release also carries `GEA-Program-Setup-0.66.0.exe` (for 0.66.0): the
+Every release also carries `GEA-Program-Setup-0.66.1.exe` (for 0.66.1): the
 same Windows kit installed like any Windows program, for the signed-in user
 alone and with no administrator rights (`%LOCALAPPDATA%\Programs\GEA-Program`).
 It asks for the site workspace (an existing one such as `C:\site` is used as
@@ -1443,7 +1443,7 @@ it, removes the program and leaves the workspace. Silent, for a site's
 software deployment:
 
 ```
-GEA-Program-Setup-0.66.0.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /WORKSPACE="C:\site" /SITENAME="Pad 3" /TASKS="desktopicon"
+GEA-Program-Setup-0.66.1.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /WORKSPACE="C:\site" /SITENAME="Pad 3" /TASKS="desktopicon"
 ```
 
 The setup is built by Inno Setup 6 from `tools/installer.iss` in the same

{gea_program-0.66.0 → gea_program-0.66.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gea-program"
-version = "0.66.0"
+version = "0.66.1"
 description = "GEA-Program: downhole gauge monitoring - canonical measurement records, quality rules, drift evaluation with a re-fit change log, well-test validation, alarm management, model cards, store-and-forward, monthly SLA measurement, FAT/SAT protocols and a dashboard, generated from live objects in the client's reporting outline."
 readme = "README.md"
 requires-python = ">=3.10"