wexample-wex-addon-dev-python 15.9.0__tar.gz → 15.10.0__tar.gz

{wexample_wex_addon_dev_python-15.9.0 → wexample_wex_addon_dev_python-15.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-wex-addon-dev-python
-Version: 15.9.0
+Version: 15.10.0
 Summary: Extends wex with commands to format, lint, and rename Python symbols, plus workdir types for Python packages and suites
 Author-Email: weeger <contact@wexample.com>
 License: MIT
@@ -20,7 +20,7 @@ Requires-Dist: pyright
 Requires-Dist: wexample-api>=6.8.0
 Requires-Dist: wexample-filestate-python>=9.4.0
 Requires-Dist: wexample-wex-addon-ai>=19.1.0
-Requires-Dist: wexample-wex-addon-app>=35.3.0
+Requires-Dist: wexample-wex-addon-app>=35.4.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
@@ -28,7 +28,7 @@ Description-Content-Type: text/markdown
 
 # wex_addon_dev_python
 
-Version: 15.9.0
+Version: 15.10.0
 
 Extends wex with commands to format, lint, and rename Python symbols, plus workdir types for Python packages and suites
 

{wexample_wex_addon_dev_python-15.9.0 → wexample_wex_addon_dev_python-15.10.0}/README.md

@@ -1,6 +1,6 @@
 # wex_addon_dev_python
 
-Version: 15.9.0
+Version: 15.10.0
 
 Extends wex with commands to format, lint, and rename Python symbols, plus workdir types for Python packages and suites
 

{wexample_wex_addon_dev_python-15.9.0 → wexample_wex_addon_dev_python-15.10.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-wex-addon-dev-python"
-version = "15.9.0"
+version = "15.10.0"
 description = "Extends wex with commands to format, lint, and rename Python symbols, plus workdir types for Python packages and suites"
 authors = [
     { name = "weeger", email = "contact@wexample.com" },
@@ -29,7 +29,7 @@ dependencies = [
     "wexample-api>=6.8.0",
     "wexample-filestate-python>=9.4.0",
     "wexample-wex-addon-ai>=19.1.0",
-    "wexample-wex-addon-app>=35.3.0",
+    "wexample-wex-addon-app>=35.4.0",
 ]
 
 [project.readme]

{wexample_wex_addon_dev_python-15.9.0 → wexample_wex_addon_dev_python-15.10.0}/src/wexample_wex_addon_dev_python/workdir/python_package_workdir.py

@@ -58,6 +58,44 @@ class PythonPackageWorkdir(PythonWorkdir):
                 "Install: pipx install pdm — then run: wex core::env/configure"
             )
 
+    def collect_pypi_upload(self) -> str | None:
+        """Wait for this package's background PyPI upload, if one is running,
+        and say what went wrong when it failed (None when it did not)."""
+        import os
+        import shutil
+        import time
+
+        upload_dir = self._get_pypi_upload_dir()
+        pid_file = upload_dir / "pid"
+        if not pid_file.is_file():
+            return None
+        pid = int(pid_file.read_text().strip() or 0)
+        rc_file = upload_dir / "rc"
+        # Done once the shell wrote the exit code, its last act. Its /proc entry
+        # outlives it as a zombie until this process reaps it, so it is no sign
+        # of life — waiting on it alone hung the release forever.
+        while pid and not rc_file.is_file() and os.path.exists(f"/proc/{pid}"):
+            try:
+                if os.waitpid(pid, os.WNOHANG)[0]:
+                    break
+            except ChildProcessError:
+                # Not this process's child (started by an earlier one): only
+                # its /proc entry tells.
+                pass
+            time.sleep(1)
+        try:
+            os.waitpid(pid, os.WNOHANG)
+        except ChildProcessError:
+            pass
+        rc = rc_file.read_text().strip() if rc_file.is_file() else "unknown"
+        log_file = upload_dir / "log"
+        report = None
+        if rc != "0":
+            tail = log_file.read_text(errors="replace").splitlines()[-5:] if log_file.is_file() else []
+            report = f"{self.get_package_name()}: PyPI upload failed (exit {rc}): " + " / ".join(tail)
+        shutil.rmtree(upload_dir, ignore_errors=True)
+        return report
+
     def get_gitlab_registry_url(self) -> str | None:
         """The GitLab PyPI registry of the group, when the suite publishes there.
 
@@ -339,6 +377,9 @@ class PythonPackageWorkdir(PythonWorkdir):
     def _get_critical_directories(self) -> list[str]:
         return ["src"]
 
+    def _get_pypi_upload_dir(self):
+        return self.get_path() / ".wex" / "tmp" / "pypi-upload"
+
     def _get_readme_content(self) -> ReadmeContentConfigValue | None:
         from wexample_wex_addon_dev_python.config_value.python_package_readme_config_value import (
             PythonPackageReadmeContentConfigValue,
@@ -563,33 +604,6 @@ class PythonPackageWorkdir(PythonWorkdir):
             cwd=self.get_path(),
         )
 
-    def collect_pypi_upload(self) -> str | None:
-        """Wait for this package's background PyPI upload, if one is running,
-        and say what went wrong when it failed (None when it did not)."""
-        import os
-        import shutil
-        import time
-
-        upload_dir = self._get_pypi_upload_dir()
-        pid_file = upload_dir / "pid"
-        if not pid_file.is_file():
-            return None
-        pid = int(pid_file.read_text().strip() or 0)
-        while pid and os.path.exists(f"/proc/{pid}"):
-            time.sleep(1)
-        rc_file = upload_dir / "rc"
-        rc = rc_file.read_text().strip() if rc_file.is_file() else "unknown"
-        log_file = upload_dir / "log"
-        report = None
-        if rc != "0":
-            tail = log_file.read_text(errors="replace").splitlines()[-5:] if log_file.is_file() else []
-            report = f"{self.get_package_name()}: PyPI upload failed (exit {rc}): " + " / ".join(tail)
-        shutil.rmtree(upload_dir, ignore_errors=True)
-        return report
-
-    def _get_pypi_upload_dir(self):
-        return self.get_path() / ".wex" / "tmp" / "pypi-upload"
-
     def _publish_to_pypi(self, force: bool = False, background: bool = False) -> None:
         from wexample_filestate_python.common.pipy_gateway import PipyGateway
         from wexample_helpers.helper.shell import shell_run

{wexample_wex_addon_dev_python-15.9.0 → wexample_wex_addon_dev_python-15.10.0}/tests/unit/test_pypi_background_upload.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
 import subprocess
+import threading
+import time
 from types import SimpleNamespace
 
 from wexample_wex_addon_dev_python.workdir.python_package_workdir import (
@@ -15,9 +17,11 @@ def _package(tmp_path):
     return package
 
 
-def _upload(tmp_path, script: str) -> None:
+def _upload(tmp_path, script: str, reap: bool = True) -> None:
     """A background upload as _publish_to_pypi leaves it: its pid, its log,
-    its exit code written when it ends."""
+    its exit code written when it ends. reap=False drops it still running, as
+    _publish_to_pypi does: Python then reaps it only at a later Popen, and
+    after the last package's there is none — it stays a zombie."""
     upload_dir = tmp_path / ".wex" / "tmp" / "pypi-upload"
     upload_dir.mkdir(parents=True)
     with open(upload_dir / "log", "w") as log:
@@ -27,7 +31,8 @@ def _upload(tmp_path, script: str) -> None:
             stderr=subprocess.STDOUT,
         )
     (upload_dir / "pid").write_text(str(process.pid))
-    process.wait()
+    if reap:
+        process.wait()
 
 
 def test_nothing_to_collect_without_an_upload(tmp_path) -> None:
@@ -45,3 +50,17 @@ def test_a_refused_upload_is_reported_with_its_log(tmp_path) -> None:
     report = PythonPackageWorkdir.collect_pypi_upload(_package(tmp_path))
     assert report.startswith("demo: PyPI upload failed (exit 1)")
     assert "File already exists" in report
+
+
+def test_an_ended_upload_left_a_zombie_is_collected(tmp_path) -> None:
+    # Its /proc entry stays until reaped: waiting on it alone hung forever.
+    _upload(tmp_path, "sleep 0.5; echo uploaded", reap=False)
+    result = {}
+    thread = threading.Thread(
+        target=lambda: result.setdefault("report", PythonPackageWorkdir.collect_pypi_upload(_package(tmp_path))),
+        daemon=True,
+    )
+    thread.start()
+    thread.join(timeout=5)
+    assert not thread.is_alive()
+    assert result["report"] is None