funcd-bundle 0.3.1__tar.gz → 0.3.2__tar.gz

{funcd_bundle-0.3.1 → funcd_bundle-0.3.2}/.gitignore

@@ -8,3 +8,5 @@ __pycache__/
 .DS_Store
 # the PyPI build (wheel + sdist), built at publish time
 dist/
+# scripts/agent/d's cached dev-shell environment
+.cache/

{funcd_bundle-0.3.1 → funcd_bundle-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: funcd-bundle
-Version: 0.3.1
+Version: 0.3.2
 Summary: Bundle a Python funcd function and its locked dependencies for the funcd runtime
 Project-URL: Homepage, https://github.com/pyvvo/funcd-python
 Project-URL: Repository, https://github.com/pyvvo/funcd-python

{funcd_bundle-0.3.1 → funcd_bundle-0.3.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "funcd-bundle"
 # Not bumped per release: the vX.Y.Z git tag is the version, stamped into the build at publish time.
-version = "0.3.1"
+version = "0.3.2"
 description = "Bundle a Python funcd function and its locked dependencies for the funcd runtime"
 authors = [{ name = "The funcd Authors" }]
 readme = "README.md"

{funcd_bundle-0.3.1 → funcd_bundle-0.3.2}/src/funcd_bundle/bundle.py

@@ -329,8 +329,14 @@ def _copy_handler(project: Path, fn: Function, out: Path) -> list[Path]:
 
         shutil.copytree(source, out, dirs_exist_ok=True, ignore=ignore)
         sources = [p for p in source.rglob("*.py") if not SKIPPED.intersection(p.relative_to(source).parts)]
-    # inside the bundle the handler sits at the root, so a `main` must name it there (funcdctl dev reads it)
-    text = MAIN_LINE.sub(f"main: {fn.handler.name}", fn.manifest.read_text())
+    # inside the bundle the handler sits at the root, so `main` must name it there (funcdctl dev reads it); a
+    # manifest without one gets one, else the bundle's generic manifest would default to handler.py
+    main = f"main: {fn.handler.name}"
+    text, found = MAIN_LINE.subn(main, fn.manifest.read_text())
+    if not found:
+        if text and not text.endswith("\n"):
+            text += "\n"
+        text += main + "\n"
     (out / GENERIC_MANIFEST).write_text(text)
     return sources
 

{funcd_bundle-0.3.1 → funcd_bundle-0.3.2}/tests/test_bundle.py

@@ -255,6 +255,26 @@ def test_default_handler_follows_funcdctl(tmp_path: Path) -> None:
     )
 
 
+def test_issue_154_stem_manifest_without_main_names_bundled_handler(tmp_path: Path) -> None:
+    manifest = "runtime: python314\nhandler: handle\n"
+    project = tmp_path / "project"
+    _write(
+        project,
+        {
+            "pyproject.toml": '[project]\nname = "extract"\nversion = "0.1.0"\nrequires-python = ">=3.12"\n',
+            "extract.funcdctl.yaml": manifest,
+            "extract.py": "def handle(ctx, event): ...\n",
+        },
+    )
+    _uv("lock", "--offline", "--python", "3.14", cwd=project)
+    out = bundle(project, "extract", host_platform(), tmp_path / "extract", hermetic=False, check=False)
+
+    assert discover(out)["extract"].handler == out / "extract.py", (
+        "the bundle's generic manifest resolves to the bundled handler, not handler.py"
+    )
+    assert (out / "funcdctl.yaml").read_text() == manifest + "main: extract.py\n"
+
+
 def test_missing_handler_is_named(tmp_path: Path) -> None:
     _write(tmp_path, {"funcdctl.yaml": "runtime: python314\nmain: src/nope.py\n"})
     with pytest.raises(BundleError, match="nope.py"):