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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-wex-addon-dev-python
-Version: 15.8.1
+Version: 15.9.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.2.0
+Requires-Dist: wexample-wex-addon-app>=35.3.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.8.1
+Version: 15.9.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.8.1 → wexample_wex_addon_dev_python-15.9.0}/README.md

@@ -1,6 +1,6 @@
 # wex_addon_dev_python
 
-Version: 15.8.1
+Version: 15.9.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.8.1 → wexample_wex_addon_dev_python-15.9.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-wex-addon-dev-python"
-version = "15.8.1"
+version = "15.9.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.2.0",
+    "wexample-wex-addon-app>=35.3.0",
 ]
 
 [project.readme]

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

@@ -494,7 +494,10 @@ class PythonPackageWorkdir(PythonWorkdir):
             if self.get_gitlab_registry_url():
                 self._publish_to_gitlab_registry(force=force)
                 try:
-                    self._publish_to_pypi(force=force)
+                    # In the background: PyPI only mirrors the GitLab registry,
+                    # nothing waits for it. The suite's publication collects
+                    # the uploads at its end (`collect_pypi_upload`).
+                    self._publish_to_pypi(force=force, background=True)
                 except ShellCommandFailedException as exception:
                     self.warning(
                         f"PyPI refused {package_name} {version}, published on the GitLab "
@@ -560,7 +563,34 @@ class PythonPackageWorkdir(PythonWorkdir):
             cwd=self.get_path(),
         )
 
-    def _publish_to_pypi(self, force: bool = False) -> None:
+    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
 
@@ -596,7 +626,30 @@ class PythonPackageWorkdir(PythonWorkdir):
         if password:
             publish_cmd += ["--password", password]
 
-        shell_run(publish_cmd, inherit_stdio=True, cwd=self.get_path())
+        if not background:
+            shell_run(publish_cmd, inherit_stdio=True, cwd=self.get_path())
+            return
+
+        import shlex
+        import shutil
+        import subprocess
+
+        # From a copy of the distributions: dist/ is cleaned as soon as this
+        # returns. The exit code is written where collect_pypi_upload reads it.
+        upload_dir = self._get_pypi_upload_dir()
+        shutil.rmtree(upload_dir, ignore_errors=True)
+        shutil.copytree(self.get_path() / "dist", upload_dir / "dist")
+        command = " ".join(shlex.quote(part) for part in [*publish_cmd, "--dest", str(upload_dir / "dist")])
+        with open(upload_dir / "log", "w") as log:
+            process = subprocess.Popen(
+                ["sh", "-c", f'( {command} ); echo $? > "{upload_dir / "rc"}"'],
+                cwd=self.get_path(),
+                stdout=log,
+                stderr=subprocess.STDOUT,
+                start_new_session=True,
+            )
+        (upload_dir / "pid").write_text(str(process.pid))
+        self.log(f"PyPI upload of {package_name} {version} running in the background.")
 
     def _wait_for_registry(self) -> None:
         from wexample_helpers.helper.polling_callback_manager import (

wexample_wex_addon_dev_python-15.9.0/tests/unit/test_pypi_background_upload.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+import subprocess
+from types import SimpleNamespace
+
+from wexample_wex_addon_dev_python.workdir.python_package_workdir import (
+    PythonPackageWorkdir,
+)
+
+
+def _package(tmp_path):
+    """Just what collect_pypi_upload reads off a package."""
+    package = SimpleNamespace(get_path=lambda: tmp_path, get_package_name=lambda: "demo")
+    package._get_pypi_upload_dir = lambda: PythonPackageWorkdir._get_pypi_upload_dir(package)
+    return package
+
+
+def _upload(tmp_path, script: str) -> None:
+    """A background upload as _publish_to_pypi leaves it: its pid, its log,
+    its exit code written when it ends."""
+    upload_dir = tmp_path / ".wex" / "tmp" / "pypi-upload"
+    upload_dir.mkdir(parents=True)
+    with open(upload_dir / "log", "w") as log:
+        process = subprocess.Popen(
+            ["sh", "-c", f'( {script} ); echo $? > "{upload_dir / "rc"}"'],
+            stdout=log,
+            stderr=subprocess.STDOUT,
+        )
+    (upload_dir / "pid").write_text(str(process.pid))
+    process.wait()
+
+
+def test_nothing_to_collect_without_an_upload(tmp_path) -> None:
+    assert PythonPackageWorkdir.collect_pypi_upload(_package(tmp_path)) is None
+
+
+def test_a_successful_upload_is_collected_silently(tmp_path) -> None:
+    _upload(tmp_path, "echo uploaded")
+    assert PythonPackageWorkdir.collect_pypi_upload(_package(tmp_path)) is None
+    assert not (tmp_path / ".wex" / "tmp" / "pypi-upload").exists()
+
+
+def test_a_refused_upload_is_reported_with_its_log(tmp_path) -> None:
+    _upload(tmp_path, "echo 'HTTP 400 File already exists'; exit 1")
+    report = PythonPackageWorkdir.collect_pypi_upload(_package(tmp_path))
+    assert report.startswith("demo: PyPI upload failed (exit 1)")
+    assert "File already exists" in report