Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions MANIFEST.in

This file was deleted.

57 changes: 57 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
[build-system]
requires = ["setuptools>=42", "wheel"]
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🌐 Web query:

What is the minimum setuptools version that supports recursive ** glob patterns in package-data / package_data?

💡 Result:

The minimum setuptools version that supports recursive glob patterns (using ) in package_data / package_data is 62.3.0.

Citations:


🏁 Script executed:

cat pyproject.toml

Repository: OpenVoiceOS/ovos-skill-volume

Length of output: 1387


Bump setuptools minimum to >=62.3.0 — recursive ** globs in package-data require this version.

The package-data entries (locale/**/*, ui/**/*, vocab/**/*, dialog/**/*, regex/**/*, skill/**/*) use recursive glob patterns that were added to setuptools in version 62.3.0. With setuptools>=42, older build environments that resolve setuptools <62.3.0 will silently ignore these patterns, causing locale, ui, vocab, dialog, regex, and skill assets to be missing from both sdist and wheel — re-introducing the exact FileNotFoundError packaging issues this PR aims to fix.

Additionally, ovos-workshop>=8.0.0,<9.0.0 appears in both dependencies (line 20) and the test extra (line 28), which is redundant since it is already available at runtime.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@pyproject.toml` at line 2, Update pyproject.toml to require
setuptools>=62.3.0 instead of >=42 so the recursive glob patterns in
package-data (locale/**, ui/**, vocab/**, dialog/**, regex/**, skill/**) are
honored during sdist/wheel builds; also remove the duplicate
ovos-workshop>=8.0.0,<9.0.0 entry from the "test" extra (keep it in the main
dependencies) so it’s not redundantly listed. Use the existing "requires" key to
bump the setuptools version and edit the extras[test] block to delete the
ovos-workshop line.

build-backend = "setuptools.build_meta"

[project]
name = "ovos-skill-volume"
dynamic = ["version"]
description = "ovos skill plugin"
readme = "README.md"
license = { text = "Apache-2.0" }
authors = [
{ name = "JarbasAi", email = "jarbasai@mailfence.com" }
]
keywords = ["ovos", "skill", "plugin"]
classifiers = [
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3",
]
requires-python = ">=3.9"
dependencies = [
"ovos-utils>=0.0.38,<1.0.0",
"ovos-workshop>=8.0.0,<9.0.0",
"ovos-utterance-normalizer>=0.0.1,<1.0.0",
"ovos-number-parser>=0.0.1,<1.0.0",
]

[project.optional-dependencies]
test = [
"pytest",
"ovos-workshop>=8.0.0,<9.0.0",
]

[project.urls]
Homepage = "https://github.com/OpenVoiceOS/ovos-skill-volume"

[project.entry-points."ovos.plugin.skill"]
"ovos-skill-volume.openvoiceos" = "ovos_skill_volume:VolumeSkill"

[tool.setuptools.dynamic]
version = { attr = "version.__version__" }

[tool.setuptools]
packages = ["ovos_skill_volume"]

[tool.setuptools.package-dir]
"ovos_skill_volume" = "."

[tool.setuptools.package-data]
"ovos_skill_volume" = [
"*.json",
"locale/**/*",
"ui/**/*",
"vocab/**/*",
"dialog/**/*",
"regex/**/*",
"skill/**/*",
]
4 changes: 0 additions & 4 deletions requirements.txt

This file was deleted.

91 changes: 0 additions & 91 deletions setup.py

This file was deleted.

2 changes: 2 additions & 0 deletions version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
VERSION_BUILD = 21
VERSION_ALPHA = 2
# END_VERSION_BLOCK

__version__ = f"{VERSION_MAJOR}.{VERSION_MINOR}.{VERSION_BUILD}" + (f"a{VERSION_ALPHA}" if VERSION_ALPHA else "")
Loading