fix(packaging): ship skills/optional-skills/locales/optional-mcps in wheel - #66846
Closed
xxiaoxiong wants to merge 1 commit into
Closed
fix(packaging): ship skills/optional-skills/locales/optional-mcps in wheel#66846xxiaoxiong wants to merge 1 commit into
xxiaoxiong wants to merge 1 commit into
Conversation
alt-glitch
added
type/bug
Collaborator
…wheel Remove [tool.setuptools.data-files] from pyproject.toml and consolidate all data_files declarations into setup.py via _data_file_tree(). Setuptools' pyproject.toml [tool.setuptools.data-files] section silently overrides setup.py's data_files= argument instead of merging them — when commit c349eca introduced the pyproject section to ship locales/ and optional-mcps/{linear,n8n}/, it accidentally dropped skills/ and optional-skills/ from the wheel (NousResearch#66733). uv build / pip wheel produced a wheel with zero skill files. Move all four data directories (skills, optional-skills, locales, optional-mcps) to setup.py data_files= so they ship together. Keep the MANIFEST.in graft entries (they cover the sdist side and are unaffected). Tests: - Update test_locale_catalogs_ship_in_both_wheel_and_sdist to assert the setup.py data_files declaration instead of the pyproject section. - Add test_skills_and_optional_skills_ship_in_wheel guarding the new contract: pyproject MUST NOT declare [tool.setuptools.data-files], and setup.py MUST include _data_file_tree() calls for skills, optional-skills, optional-mcps. Verified: uv build --wheel now ships 454 skills files, 534 optional-skills files, 16 locales, and 4 optional-mcps manifests (was: 0 skills, 0 optional-skills before this fix). Fixes NousResearch#66733.
xxiaoxiong
force-pushed
the
fix/66733-skills-missing-from-wheel
branch
from
July 18, 2026 10:11
27ab4a9 to
8b45716
Compare
Author
|
Thanks for the review — rebased this branch on top of Files in diff: The unrelated |
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
Since commit c349eca, wheels built from the repo contain zero skill files. Skills and optional-skills silently dropped out of the install artifact.
Root cause
's
[tool.setuptools.data-files]section silently overridessetup.py'sdata_files=argument instead of merging with it. When c349eca added the pyproject section to shiplocales/andoptional-mcps/{linear,n8n}/, setuptools discarded the_data_file_tree("skills")and_data_file_tree("optional-skills")calls insetup().Fix
Remove
[tool.setuptools.data-files]frompyproject.tomlentirely. Consolidate all data-directory declarations intosetup.py:_data_file_tree("skills")_data_file_tree("optional-skills")_data_file_tree("locales")_data_file_tree("optional-mcps")MANIFEST.ingrafts (sdist side) are unchanged.Verification
tests/test_packaging_metadata.pytests pass (existing + 1 new test)uv build --wheelnow ships 454 skills + 534 optional-skills files (was 0 before this fix)Related
Fixes #66733