refactor: switch to pdm build skills

Author: PsiACE

contrib/bubseek-marimo/pyproject.toml

@@ -17,15 +17,13 @@ dependencies = [
 marimo = "bubseek_marimo.plugin"
 
 [build-system]
-requires = ["pdm-backend", "pdm-build-bub>=0.1.0a1"]
+requires = ["pdm-backend", "pdm-build-skills>=0.1.0a3"]
 build-backend = "pdm.backend"
 
 [tool.pdm.build]
 package-dir = "src"
-includes = ["src/bubseek_marimo", "src/bub_skills"]
-source-include = ["src/bub_skills/marimo/SKILL.md"]
-
-[tool.bub]
+includes = ["src/bubseek_marimo", "src/skills"]
+source-include = ["src/skills/marimo/SKILL.md"]
 skills = [
     { git = "https://github.com/marimo-team/skills.git", subpath = "skills", include = ["add-molab-badge", "anywidget", "implement-paper", "marimo-batch", "marimo-notebook", "wasm-compatibility"] },
 ]

…ek-marimo/src/bub_skills/marimo/SKILL.md …ubseek-marimo/src/skills/marimo/SKILL.mdcontrib/bubseek-marimo/src/bub_skills/marimo/SKILL.md renamed to contrib/bubseek-marimo/src/skills/marimo/SKILL.md contrib/bubseek-marimo/src/bub_skills/marimo/SKILL.md renamed to contrib/bubseek-marimo/src/skills/marimo/SKILL.md

@@ -80,9 +80,9 @@ When `BUB_TAPESTORE_SQLALCHEMY_URL` is unset, bubseek builds a SeekDB/OceanBase
 
 ## Builtin skills
 
-Builtin skill source files live in `src/bub_skills/`. They are packaged into `bub_skills/` in the wheel, which Bub already knows how to discover. Users do not need to run a separate sync command for them.
+Builtin skill source files live in `src/skills/`. They are packaged into `skills/` in the wheel, which Bub already knows how to discover. Users do not need to run a separate sync command for them.
 
-bubseek also vendors `friendly-python` and `piglet` from [PsiACE/skills](https://github.com/PsiACE/skills) at build time via `pdm-build-bub`; these are merged into the wheel under `bub_skills/`.
+bubseek also vendors `friendly-python` and `piglet` from [PsiACE/skills](https://github.com/PsiACE/skills) at build time via `pdm-build-skills`; these are merged into the wheel under `skills/`.
 
 The optional `bubseek[marimo]` extra provides:
 - **MarimoChannel** — inbound WebSocket for gateway; chat dashboard at `http://0.0.0.0:2718/`
@@ -97,14 +97,14 @@ Run `bubseek gateway --enable-channel marimo` to enable the marimo dashboard.
 
 Most users can skip this section.
 
-If you are building your own downstream Bub distribution and want to vendor remote skill repositories at build time, use `pdm-build-bub`:
+If you are building your own downstream Bub distribution and want to vendor remote skill repositories at build time, use `pdm-build-skills`:
 
 ```toml
 [build-system]
-requires = ["pdm-backend", "pdm-build-bub>=0.1.0a1"]
+requires = ["pdm-backend", "pdm-build-skills>=0.1.0a3"]
 build-backend = "pdm.backend"
 
-[tool.bub]
+[tool.pdm.build]
 skills = [
     { git = "PsiACE/skills", subpath = "skills", include = ["friendly-python", "piglet"] },
     { git = "https://github.com/example/skills.git", ref = "v1.2.3", subpath = "skills/review" },

…marimo/src/bub_skills/marimo/__init__.py …eek-marimo/src/skills/marimo/__init__.pycontrib/bubseek-marimo/src/bub_skills/marimo/__init__.py renamed to contrib/bubseek-marimo/src/skills/marimo/__init__.py contrib/bubseek-marimo/src/bub_skills/marimo/__init__.py renamed to contrib/bubseek-marimo/src/skills/marimo/__init__.py

@@ -42,8 +42,8 @@ uv run pytest tests
 make build
 ```
 
-The wheel includes builtin skills from `bub_skills/`.
-The source files for those builtin skills live in `src/bub_skills/`.
+The wheel includes builtin skills from `skills/`.
+The source files for those builtin skills live in `src/skills/`.
 
 ## Docs
 

…/marimo/references/marimo-conventions.md …/marimo/references/marimo-conventions.mdcontrib/bubseek-marimo/src/bub_skills/marimo/references/marimo-conventions.md renamed to contrib/bubseek-marimo/src/skills/marimo/references/marimo-conventions.md contrib/bubseek-marimo/src/bub_skills/marimo/references/marimo-conventions.md renamed to contrib/bubseek-marimo/src/skills/marimo/references/marimo-conventions.md

@@ -62,17 +62,14 @@ dev = [
 ]
 
 [build-system]
-requires = ["pdm-backend", "pdm-build-bub>=0.1.0a2"]
+requires = ["pdm-backend", "pdm-build-skills>=0.1.0a3"]
 build-backend = "pdm.backend"
 
 [tool.pdm.build]
 includes = [
     "src/bubseek",
-    "src/bub_skills",
+    "src/skills",
 ]
-
-# Build-time: vendor remote skills into bub_skills/ (merged with src/bub_skills)
-[tool.bub]
 skills = [
     { git = "https://github.com/PsiACE/skills.git", subpath = "skills", include = ["friendly-python", "piglet"] },
 ]

docs/configuration.md

@@ -50,20 +50,28 @@ def test_pyproject_pins_bub_and_bundled_plugins() -> None:
     assert sources["bub-feishu"].get("git") == "https://github.com/bubbuild/bub-contrib.git"
     requires = data["build-system"]["requires"]
     assert "pdm-backend" in requires
-    assert any("pdm-build-bub" in r for r in requires)
+    assert any("pdm-build-skills" in r for r in requires)
 
 
 def test_pyproject_includes_builtin_skills_in_wheel() -> None:
     data = tomllib.loads((REPO_ROOT / "pyproject.toml").read_text(encoding="utf-8"))
 
     assert data["tool"]["pdm"]["build"]["includes"] == [
         "src/bubseek",
-        "src/bub_skills",
+        "src/skills",
+    ]
+    skills = data["tool"]["pdm"]["build"]["skills"]
+    assert skills == [
+        {
+            "git": "https://github.com/PsiACE/skills.git",
+            "subpath": "skills",
+            "include": ["friendly-python", "piglet"],
+        }
     ]
 
 
 def test_bundled_skills_have_valid_frontmatter() -> None:
-    skill_root = REPO_ROOT / "src" / "bub_skills"
+    skill_root = REPO_ROOT / "src" / "skills"
     skill_names = []
 
     for skill_dir in sorted(path for path in skill_root.iterdir() if path.is_dir()):