pyship 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

pyship/clip.py

@@ -60,8 +60,8 @@ def create_base_clip(target_app_info: AppInfo, app_dir: Path, cache_dir: Path) -
     pyship_print(f'building clip {clip_dir_name} ("{clip_dir}")')
 
     uv_path = find_or_bootstrap_uv(cache_dir)
-    uv_python_install(uv_path, python_version)
-    uv_venv_create(uv_path, clip_dir, python_version)
+    python_path = uv_python_install(uv_path, python_version)
+    uv_venv_create(uv_path, clip_dir, str(python_path))
 
     return clip_dir
 

pyship/create_launcher.py

@@ -16,6 +16,63 @@ from pyship.launcher_stub import compile_launcher_stub
 log = get_logger(launcher_application_name)
 
 
+@typechecked
+def _write_diagnostic_bat(app_name: str, bat_path: Path):
+    """
+    Write a diagnostic .bat file that runs the launcher script with python.exe (not pythonw.exe)
+    so that all console output is visible for troubleshooting.
+    :param app_name: target application name
+    :param bat_path: path where the .bat file will be written
+    """
+    bat_content = f"""@echo off
+REM Diagnostic launcher for {app_name}
+REM Runs the launcher script with python.exe (console) so output is always visible.
+
+setlocal
+
+set "LAUNCHER_DIR=%~dp0"
+REM Remove trailing backslash
+if "%LAUNCHER_DIR:~-1%"=="\\" set "LAUNCHER_DIR=%LAUNCHER_DIR:~0,-1%"
+
+REM app_dir is the parent of launcher_dir
+for %%I in ("%LAUNCHER_DIR%") do set "APP_DIR=%%~dpI"
+if "%APP_DIR:~-1%"=="\\" set "APP_DIR=%APP_DIR:~0,-1%"
+
+REM Find the latest CLIP directory containing Scripts\\python.exe
+set "PYTHON_EXE="
+for /d %%D in ("%APP_DIR%\\{app_name}_*") do (
+    if exist "%%D\\Scripts\\python.exe" (
+        set "PYTHON_EXE=%%D\\Scripts\\python.exe"
+    )
+)
+
+if not defined PYTHON_EXE (
+    echo ERROR: No Python environment found for {app_name} in %APP_DIR%
+    pause
+    exit /b 1
+)
+
+echo Using Python: %PYTHON_EXE%
+echo Running: %PYTHON_EXE% "%LAUNCHER_DIR%\\{app_name}_launcher.py" --app-dir "%APP_DIR%" %*
+echo.
+
+"%PYTHON_EXE%" "%LAUNCHER_DIR%\\{app_name}_launcher.py" --app-dir "%APP_DIR%" %*
+
+set "EXIT_CODE=%ERRORLEVEL%"
+echo.
+echo Exit code: %EXIT_CODE%
+if not "%EXIT_CODE%"=="0" (
+    echo.
+    echo ERROR: {app_name} exited with code %EXIT_CODE%
+    pause
+)
+
+endlocal
+exit /b %EXIT_CODE%
+"""
+    bat_path.write_text(bat_content, encoding="utf-8")
+
+
 @typechecked
 def create_pyship_launcher(target_app_info: AppInfo, app_path_output: Path):
     """
@@ -69,13 +126,18 @@ def create_pyship_launcher(target_app_info: AppInfo, app_path_output: Path):
             shutil.copy2(str(standalone_source), str(standalone_dest))
             log.info(f"copied launcher script to {standalone_dest}")
 
-            # 3. Copy the icon alongside
+            # 3. Generate diagnostic .bat launcher (always uses python.exe for console output)
+            bat_path = Path(launcher_dir, f"{target_app_info.name}.bat")
+            _write_diagnostic_bat(target_app_info.name, bat_path)
+            log.info(f"wrote diagnostic bat to {bat_path}")
+
+            # 4. Copy the icon alongside
             if icon_path.exists():
                 icon_dest = Path(launcher_dir, f"{target_app_info.name}.ico")
                 shutil.copy2(str(icon_path), str(icon_dest))
                 log.info(f"copied icon to {icon_dest}")
 
-            # 4. Store metadata for cache invalidation
+            # 5. Store metadata for cache invalidation
             store_metadata(app_path_output, metadata_filename, metadata)
 
             if launcher_exe_path.exists():

pyship/launcher/launcher.py

@@ -241,6 +241,27 @@ def launch(app_dir=None, additional_path=None):
                     std_out = target_process.stdout
                     std_err = target_process.stderr
 
+                    # When pythonw.exe fails silently (no stderr), re-run with python.exe to capture the actual error
+                    if is_gui and return_code not in (OK_RETURN_CODE, RESTART_RETURN_CODE) and not (std_err and std_err.strip()):
+                        log.warning(f"pythonw.exe exited with return_code={return_code} but produced no error output, re-running with python.exe for diagnostics")
+                        diag_python = Path(versions[latest_version], "Scripts", "python.exe")
+                        if diag_python.exists():
+                            diag_cmd = [str(diag_python), "-X", "faulthandler"] + cmd[1:]
+                            log.info(f"diagnostic cmd={diag_cmd}")
+                            try:
+                                diag_process = subprocess.run(diag_cmd, cwd=str(python_exe_path.parent), capture_output=True, text=True)
+                                diag_return_code = diag_process.returncode
+                                std_out = diag_process.stdout
+                                std_err = diag_process.stderr
+                                if std_err and std_err.strip():
+                                    log.info(f"diagnostic stderr captured (return_code={diag_return_code})")
+                                elif std_out and std_out.strip():
+                                    log.info(f"diagnostic stdout captured (return_code={diag_return_code})")
+                                else:
+                                    log.warning(f"diagnostic re-run with python.exe also produced no output (return_code={diag_return_code})")
+                            except Exception as diag_e:
+                                log.error(f"diagnostic re-run failed: {diag_e}")
+
                     if (std_err and std_err.strip()) or (return_code != OK_RETURN_CODE and return_code != RESTART_RETURN_CODE):
                         if std_out and std_out.strip():
                             log.warning(std_out)

pyship/uv_util.py

@@ -92,17 +92,24 @@ def uv_python_install(uv_path: Path, python_version: str) -> Path:
 
 
 @typechecked
-def uv_venv_create(uv_path: Path, venv_dir: Path, python_version: str) -> None:
+def uv_venv_create(uv_path: Path, venv_dir: Path, python_version_or_path: str) -> None:
     """
     Create a relocatable venv using uv.
     :param uv_path: path to uv executable
     :param venv_dir: destination directory for the venv
-    :param python_version: Python version string
+    :param python_version_or_path: Python version string (e.g. "3.11") or path to Python executable
     """
     pyship_print(f'creating relocatable venv at "{venv_dir}"')
-    cmd = [str(uv_path), "venv", "--relocatable", "--python", python_version, str(venv_dir)]
+    cmd = [str(uv_path), "venv", "--relocatable", "--clear", "--python", python_version_or_path, str(venv_dir)]
     log.info(f"uv venv cmd: {cmd}")
-    subprocess.run(cmd, check=True, capture_output=True, text=True)
+    result = subprocess.run(cmd, capture_output=True, text=True)
+    if result.stdout:
+        log.info(result.stdout)
+    if result.stderr:
+        log.info(result.stderr)
+    if result.returncode != 0:
+        log.error(f"uv venv failed (exit {result.returncode}): {result.stderr}")
+        result.check_returncode()
 
 
 @typechecked

{pyship-0.4.0.dist-info → pyship-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyship
-Version: 0.4.0
+Version: 0.4.2
 Summary: freezer, installer and updater for Python applications
 Author-email: abel <j@abel.co>
 License: MIT

{pyship-0.4.0.dist-info → pyship-0.4.2.dist-info}/RECORD

@@ -3,10 +3,10 @@ pyship/__main__.py,sha256=KtAdk7BCWhXbhywlFB8P4HbvypVkqJXbxgMW3XVD-To,84
 pyship/__version__.py,sha256=y-oqerPvrMS7jU7JSdHdUyKkSxJWA0anyoCQCfQ3INQ,502
 pyship/app_info.py,sha256=UTWD4ol226sNAAYsiByMJswIIL1lN8nx96PpD43YQG4,6866
 pyship/arguments.py,sha256=p4cA8FwbNSZqg4XI6LsYit1QN7TpAWWZH2xrgLf-f-g,1882
-pyship/clip.py,sha256=N6es31zy0l3kakf1Enxt2fqkcMQoaUSXMlcCqhHJdWI,3700
+pyship/clip.py,sha256=9RGqXSYGmR89T8ng6f9fDkhy61_aytRvMcXKp3yh6Yo,3716
 pyship/cloud.py,sha256=k8m-254Akpp3NALeP0pJzFs21_2qZmmK0GHfSC-Z0sw,1282
 pyship/constants.py,sha256=Y-yA_MMwL572UbZqmhILrJL6NH9xK3q5jELJR6atw7I,243
-pyship/create_launcher.py,sha256=2wyEmB7Xe-CwpTi8qfpSE6ki0iO6hw1HkVq0GrM0CYs,3783
+pyship/create_launcher.py,sha256=vg2vsyeQlxsmVNVlgO1KVtbtacUTwJG8pWZkUf35jmQ,5771
 pyship/download.py,sha256=QHbdVwxLNBToMEC0tOF2ZquDpoydRu0-cj7LOERr5Q4,2460
 pyship/launcher_stub.py,sha256=3yC1EKk45m4GOJ_uat1OWKUFqgAWdcpfQZKh7qhflnk,6889
 pyship/logging.py,sha256=cIB7487tN8TsKeDHwwzjA30rHRW5Ci5GA5uPbaEXaY0,966
@@ -20,15 +20,15 @@ pyship/pyship_exceptions.py,sha256=teUOh3FuRUU9hyv7L4owACQZPWNdwpYTEz6l-Ao35nw,9
 pyship/pyship_get_icon.py,sha256=BQp_xYl8CXt2e7nDB0llSxr0hbP7to2fkQqPeu8WpIg,2050
 pyship/pyship_path.py,sha256=RpU2n7pWXTr0501S7U8KxWCpBc8jOqKPuaX0X6IWPI8,262
 pyship/pyship_subprocess.py,sha256=hH4MW_j2zLJLDmLDkkl2JWupXrvSemAeCPAEtPdSGyk,3212
-pyship/uv_util.py,sha256=vGvaR9Uj7MGAhc5mS1q8LpoM9ctetQwkYQCZS7rwyWM,5654
+pyship/uv_util.py,sha256=sAofeT4I9Xs__UW9w3sY2r9b_lLrfuZmOomxVLXdikE,5990
 pyship/launcher/__init__.py,sha256=25vVghziYIHDBA0mCaGqhj6hWxxjQqlm4LrY0Hem0YY,245
 pyship/launcher/__main__.py,sha256=KhFSf1RU5Cj15y0c4FlzvIvDpWWi9NKYy0gzJ-w7KQE,115
 pyship/launcher/hash.py,sha256=THEh8G-StEJeh5tH24RnAQpYB0Zv1nnBwqOoStN6_NY,1153
-pyship/launcher/launcher.py,sha256=1HIXieq17IQFuldBAkmo7tjpsjADQVw7R8zXXQpEMXs,10654
+pyship/launcher/launcher.py,sha256=FNUNApE2L9Ol7JISwTxFi2mK_eHBBTSOcOpkPyQkwG4,12422
 pyship/launcher/metadata.py,sha256=PnOkYLQf6NYvPiZWhf0LAUjmFWzURKWriRQJSy3T-x4,1969
 pyship/launcher/restart_monitor.py,sha256=jfzchLxGuC_xUNdPAr849FhAdozJ6BX9M-gqLd-gGIA,952
-pyship-0.4.0.dist-info/licenses/LICENSE,sha256=vfTkV97IHvr2g_I1pGQg2bRYT05ktYYgaPwBDKNRv98,1093
-pyship-0.4.0.dist-info/METADATA,sha256=qxJGV9jequ_Q_68h0pV1aRiuYACDn6h-Ec9bmA_JH5I,2513
-pyship-0.4.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pyship-0.4.0.dist-info/top_level.txt,sha256=mlozeft-UInVAceSajzNvtkn2vPa8El9j0RulsTVtlU,7
-pyship-0.4.0.dist-info/RECORD,,
+pyship-0.4.2.dist-info/licenses/LICENSE,sha256=vfTkV97IHvr2g_I1pGQg2bRYT05ktYYgaPwBDKNRv98,1093
+pyship-0.4.2.dist-info/METADATA,sha256=lI2OnHEw5uFnXUBi1inlIkPtYfraEQrGC-YGhR7adNc,2513
+pyship-0.4.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pyship-0.4.2.dist-info/top_level.txt,sha256=mlozeft-UInVAceSajzNvtkn2vPa8El9j0RulsTVtlU,7
+pyship-0.4.2.dist-info/RECORD,,