pyproject : add conversion folder and update dependencies (#23746)

* add conversion folder and update dependencies

* limit python version for triton

* update dev-dependencies section

diff --git a/gguf-py/pyproject.toml b/gguf-py/pyproject.toml
index b2a36460ad883490e909aaa86dd74701a9286eb2..d11c34a2186d7180345f0050c746df51043b5620 100644 (file)
--- a/gguf-py/pyproject.toml
+++ b/gguf-py/pyproject.toml
@@ -37,7 +37,7 @@ packages = [
 [tool.poetry.dependencies]
 python = ">=3.10"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 pytest = "^5.2"
 
 [build-system]

diff --git a/pyproject.toml b/pyproject.toml
index a39c4f010bb20c1bb243194ab47771d62843fcee..e4f8c86b9516fefef365c7f91c36eedfd671d37e 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,13 +6,13 @@ version = "0.0.0"
 dynamic = ["classifiers"]
 readme = "README.md"
 authors = [{name = "GGML", email = "ggml@ggml.ai"}]
-requires-python = '>=3.10'
+requires-python = '>=3.10,<3.15'
 dependencies = [
-    'numpy (>=1.25.0,<2.0.0)',
+    'numpy (>=1.26.4,<3.0.0)',
     'sentencepiece (>=0.1.98,<0.3.0)',
     'transformers (==5.5.1)',
-    'protobuf (>=4.21.0)',
-    'torch (>=2.2.0,<3.0.0)',
+    'protobuf (>=4.21.0,<5.0.0)',
+    'torch (>=2.6.0,<3.0.0)',
     'gguf @ ./gguf-py',
 ]
 classifiers = [
@@ -32,17 +32,20 @@ llama-convert-llama-ggml-to-gguf = "convert_llama_ggml_to_gguf:main"
 llama-ggml-vk-generate-shaders = "ggml_vk_generate_shaders:main"
 
 [tool.poetry]
-packages = [{ include = "*.py", from = "." }]
+packages = [
+    { include = "*.py", from = "." },
+    { include = "conversion", from = "." },
+]
 
 [tool.poetry.dependencies]
 torch = [
-    { version = "~=2.6.0", source = "pypi", markers = "sys_platform == 'darwin'" },
-    { version = "~=2.6.0+cpu", source = "pytorch", markers = "sys_platform == 'linux'" },
-    { version = "~=2.6.0", source = "pypi", markers = "sys_platform == 'win32'" }
+    { version = "==2.11.0", source = "pypi", markers = "sys_platform == 'darwin'" },
+    { version = "==2.11.0+cpu", source = "pytorch", markers = "sys_platform == 'linux'" },
+    { version = "==2.11.0", source = "pypi", markers = "sys_platform == 'win32'" },
 ]
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^5.2"
+pytest = "~=8.3.3"
 
 # Force wheel + cpu
 # For discussion and context see https://github.com/python-poetry/poetry#6409