shipit-cli 0.22.0__tar.gz → 0.22.1__tar.gz

{shipit_cli-0.22.0 → shipit_cli-0.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.22.0
+Version: 0.22.1
 Summary: Shipit CLI is the best way to build, serve and deploy your projects anywhere.
 Project-URL: homepage, https://wasmer.io
 Project-URL: repository, https://github.com/wasmerio/shipit

{shipit_cli-0.22.0 → shipit_cli-0.22.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.22.0"
+version = "0.22.1"
 description = "Shipit CLI is the best way to build, serve and deploy your projects anywhere."
 readme = "README.md"
 requires-python = ">=3.10"

{shipit_cli-0.22.0 → shipit_cli-0.22.1}/src/shipit/runners/wasmer.py

@@ -29,6 +29,8 @@ SHIPIT_CONFIG_ANNOTATION = "shipitcli.com/config"
 SHIPIT_PROVIDER_ANNOTATION = "shipitcli.com/provider"
 SHIPIT_VERSION_ANNOTATION = "shipitcli.com/version"
 WASMER_APP_KIND_ANNOTATION = "wasmer.io/app-kind"
+WASMER_VERSION_ANNOTATION = "wasmer.io/version"
+BUILD_ANNOTATIONS_FILENAME = "build-annotations.yaml"
 EDGEJS_QUICKJS_DEPENDENCY = "wasmer/edgejs-quickjs@=0.0.7"
 PHPIX_VERSION = "0.3.0-rc.2"
 
@@ -41,7 +43,10 @@ def serialize_provider_config(provider_config: Any) -> Dict[str, Any]:
     if provider_config is None:
         return {}
     if hasattr(provider_config, "model_dump"):
-        return provider_config.model_dump(mode="json", exclude_none=True)
+        return provider_config.model_dump(
+            mode="json",
+            exclude_defaults=True,
+        )
     if isinstance(provider_config, dict):
         return provider_config
     return {}
@@ -313,6 +318,7 @@ class WasmerRunner:
         return new_build_steps
 
     def build(self, serve: Serve) -> None:
+        self._write_build_annotations()
         self.build_prepare(serve)
         self.build_serve(serve)
 
@@ -635,6 +641,7 @@ class WasmerRunner:
 
         annotations = yaml_config.get("annotations", {})
         assert isinstance(annotations, dict), "annotations must be a dictionary"
+        annotations.update(self._load_build_annotations())
         annotations[SHIPIT_CONFIG_ANNOTATION] = serialize_provider_config(
             self.provider_config
         )
@@ -759,6 +766,36 @@ class WasmerRunner:
             env=env or os.environ,
         )
 
+    def _get_wasmer_version(self) -> str:
+        result = subprocess.run(
+            [self.bin, "--version"],
+            check=True,
+            capture_output=True,
+            text=True,
+        )
+        output = result.stdout.strip()
+        name, separator, version = output.partition(" ")
+        if name.lower() != "wasmer" or not separator or not version:
+            raise ValueError(f"Unexpected Wasmer version output: {output!r}")
+        return version
+
+    def _write_build_annotations(self) -> None:
+        self.wasmer_dir_path.mkdir(parents=True, exist_ok=True)
+        annotations_path = self.wasmer_dir_path / BUILD_ANNOTATIONS_FILENAME
+        annotations_path.write_text(
+            yaml.dump({WASMER_VERSION_ANNOTATION: self._get_wasmer_version()})
+        )
+
+    def _load_build_annotations(self) -> Dict[str, Any]:
+        annotations_path = self.wasmer_dir_path / BUILD_ANNOTATIONS_FILENAME
+        if not annotations_path.exists():
+            return {}
+        annotations = yaml.safe_load(annotations_path.read_text()) or {}
+        assert isinstance(annotations, dict), (
+            f"{BUILD_ANNOTATIONS_FILENAME} must contain a dictionary"
+        )
+        return annotations
+
     def _update_app_yaml(
         self, app_owner: Optional[str] = None, app_name: Optional[str] = None
     ) -> None:

{shipit_cli-0.22.0 → shipit_cli-0.22.1}/src/shipit/version.py

@@ -1,7 +1,7 @@
 __all__ = ["version", "version_info"]
 
 
-version = "0.22.0"  # x-release-please-version
+version = "0.22.1"  # x-release-please-version
 _version_parts = version.split(".")
 version_info = (
     int(_version_parts[0]),

{shipit_cli-0.22.0 → shipit_cli-0.22.1}/tests/test_wasmer_annotations.py

@@ -1,3 +1,4 @@
+import subprocess
 import tomllib
 from pathlib import Path
 
@@ -7,7 +8,12 @@ import yaml
 from shipit.providers.node import NodeConfig
 from shipit.providers.php import PhpFramework
 from shipit.providers.python import PythonConfig, PythonFramework
-from shipit.runners.wasmer import WasmerRunner, resolve_app_kind
+from shipit.runners.wasmer import (
+    BUILD_ANNOTATIONS_FILENAME,
+    WasmerRunner,
+    resolve_app_kind,
+    serialize_provider_config,
+)
 from shipit.shipit_types import Package, Serve, Volume
 from shipit.version import version as shipit_version
 
@@ -54,7 +60,17 @@ def test_resolve_app_kind(
     assert resolve_app_kind(provider, framework) == expected
 
 
-def test_wasmer_app_yaml_adds_python_annotations(tmp_path: Path) -> None:
+def test_serialize_provider_config_excludes_defaults() -> None:
+    assert serialize_provider_config(PythonConfig()) == {}
+    assert serialize_provider_config(
+        PythonConfig(framework=PythonFramework.Django)
+    ) == {"framework": "django"}
+
+
+def test_wasmer_app_yaml_adds_python_annotations(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
     src_dir = tmp_path / "src"
     src_dir.mkdir()
     (src_dir / "app.yaml").write_text(
@@ -63,6 +79,7 @@ def test_wasmer_app_yaml_adds_python_annotations(tmp_path: Path) -> None:
 
     runner = WasmerRunner(DummyBuildBackend(tmp_path), src_dir)
     runner.prepare_config(PythonConfig(framework=PythonFramework.Django))
+    monkeypatch.setattr(runner, "_get_wasmer_version", lambda: "7.2.0")
 
     serve = Serve(
         name="django",
@@ -76,16 +93,23 @@ def test_wasmer_app_yaml_adds_python_annotations(tmp_path: Path) -> None:
         },
     )
 
-    runner.build_serve(serve)
+    runner.build(serve)
 
     app_yaml = yaml.safe_load((runner.wasmer_dir_path / "app.yaml").read_text())
     annotations = app_yaml["annotations"]
+    build_annotations = yaml.safe_load(
+        (runner.wasmer_dir_path / BUILD_ANNOTATIONS_FILENAME).read_text()
+    )
 
+    assert build_annotations == {"wasmer.io/version": "7.2.0"}
     assert annotations["example.com/existing"] == "keep"
     assert annotations["shipitcli.com/provider"] == "python"
     assert annotations["shipitcli.com/version"] == shipit_version
     assert annotations["wasmer.io/app-kind"] == "django"
+    assert annotations["wasmer.io/version"] == "7.2.0"
     assert annotations["shipitcli.com/config"]["framework"] == "django"
+    assert "python_version" not in annotations["shipitcli.com/config"]
+    assert "precompile_python" not in annotations["shipitcli.com/config"]
     assert (
         annotations["shipitcli.com/config"]["cross_platform"]
         == "wasix_wasm32"
@@ -184,6 +208,28 @@ def test_wasmer_run_command_inherits_stdio(
     }
 
 
+def test_get_wasmer_version(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    src_dir = tmp_path / "src"
+    src_dir.mkdir()
+    runner = WasmerRunner(DummyBuildBackend(tmp_path), src_dir, bin="wasmer")
+
+    def fake_run(*args, **kwargs):
+        assert args == (["wasmer", "--version"],)
+        assert kwargs == {
+            "check": True,
+            "capture_output": True,
+            "text": True,
+        }
+        return subprocess.CompletedProcess(args[0], 0, stdout="wasmer 7.2.0\n")
+
+    monkeypatch.setattr("shipit.runners.wasmer.subprocess.run", fake_run)
+
+    assert runner._get_wasmer_version() == "7.2.0"
+
+
 def test_wasmer_node_manifest_maps_to_edgejs(tmp_path: Path) -> None:
     src_dir = tmp_path / "src"
     src_dir.mkdir()