From 8a1d9c25fafbaf4182dd0b785dd6303ee40d55bc Mon Sep 17 00:00:00 2001
From: Vinesh Janarthanan <36610342+VJHack@users.noreply.github.com>
Date: Wed, 8 Jan 2025 12:54:58 -0600
Subject: [PATCH] gguf-py : move scripts directory (#11116)

* Moved scripts dir and fixed pyproject.toml

* updated readme

* fixed README urls

* bump pypi gguf to v0.14.0

* retrigger ci

* empty commit - trigger ci
---
 gguf-py/README.md                                 |  8 ++++----
 gguf-py/{ => gguf}/scripts/__init__.py            |  0
 gguf-py/{ => gguf}/scripts/gguf_convert_endian.py |  0
 gguf-py/{ => gguf}/scripts/gguf_dump.py           |  0
 gguf-py/{ => gguf}/scripts/gguf_hash.py           |  0
 gguf-py/{ => gguf}/scripts/gguf_new_metadata.py   |  0
 gguf-py/{ => gguf}/scripts/gguf_set_metadata.py   |  0
 gguf-py/pyproject.toml                            | 11 +++++------
 8 files changed, 9 insertions(+), 10 deletions(-)
 rename gguf-py/{ => gguf}/scripts/__init__.py (100%)
 rename gguf-py/{ => gguf}/scripts/gguf_convert_endian.py (100%)
 rename gguf-py/{ => gguf}/scripts/gguf_dump.py (100%)
 rename gguf-py/{ => gguf}/scripts/gguf_hash.py (100%)
 rename gguf-py/{ => gguf}/scripts/gguf_new_metadata.py (100%)
 rename gguf-py/{ => gguf}/scripts/gguf_set_metadata.py (100%)

diff --git a/gguf-py/README.md b/gguf-py/README.md
index 24af96a17..37a75923b 100644
--- a/gguf-py/README.md
+++ b/gguf-py/README.md
@@ -15,13 +15,13 @@ pip install gguf
 
 [examples/writer.py](https://github.com/ggerganov/llama.cpp/blob/master/gguf-py/examples/writer.py) — Generates `example.gguf` in the current directory to demonstrate generating a GGUF file. Note that this file cannot be used as a model.
 
-[scripts/gguf_dump.py](https://github.com/ggerganov/llama.cpp/blob/master/gguf-py/scripts/gguf_dump.py) — Dumps a GGUF file's metadata to the console.
+[gguf/scripts/gguf_dump.py](https://github.com/ggerganov/llama.cpp/blob/master/gguf-py/gguf/scripts/gguf_dump.py) — Dumps a GGUF file's metadata to the console.
 
-[scripts/gguf_set_metadata.py](https://github.com/ggerganov/llama.cpp/blob/master/gguf-py/scripts/gguf_set_metadata.py) — Allows changing simple metadata values in a GGUF file by key.
+[gguf/scripts/gguf_set_metadata.py](https://github.com/ggerganov/llama.cpp/blob/master/gguf-py/gguf/scripts/gguf_set_metadata.py) — Allows changing simple metadata values in a GGUF file by key.
 
-[scripts/gguf_convert_endian.py](https://github.com/ggerganov/llama.cpp/blob/master/gguf-py/scripts/gguf_convert_endian.py) — Allows converting the endianness of GGUF files.
+[gguf/scripts/gguf_convert_endian.py](https://github.com/ggerganov/llama.cpp/blob/master/gguf-py/gguf/scripts/gguf_convert_endian.py) — Allows converting the endianness of GGUF files.
 
-[scripts/gguf_new_metadata.py](https://github.com/ggerganov/llama.cpp/blob/master/gguf-py/scripts/gguf_new_metadata.py) — Copies a GGUF file with added/modified/removed metadata values.
+[gguf/scripts/gguf_new_metadata.py](https://github.com/ggerganov/llama.cpp/blob/master/gguf-py/gguf/scripts/gguf_new_metadata.py) — Copies a GGUF file with added/modified/removed metadata values.
 
 ## Development
 Maintainers who participate in development of this package are advised to install it in editable mode:
diff --git a/gguf-py/scripts/__init__.py b/gguf-py/gguf/scripts/__init__.py
similarity index 100%
rename from gguf-py/scripts/__init__.py
rename to gguf-py/gguf/scripts/__init__.py
diff --git a/gguf-py/scripts/gguf_convert_endian.py b/gguf-py/gguf/scripts/gguf_convert_endian.py
similarity index 100%
rename from gguf-py/scripts/gguf_convert_endian.py
rename to gguf-py/gguf/scripts/gguf_convert_endian.py
diff --git a/gguf-py/scripts/gguf_dump.py b/gguf-py/gguf/scripts/gguf_dump.py
similarity index 100%
rename from gguf-py/scripts/gguf_dump.py
rename to gguf-py/gguf/scripts/gguf_dump.py
diff --git a/gguf-py/scripts/gguf_hash.py b/gguf-py/gguf/scripts/gguf_hash.py
similarity index 100%
rename from gguf-py/scripts/gguf_hash.py
rename to gguf-py/gguf/scripts/gguf_hash.py
diff --git a/gguf-py/scripts/gguf_new_metadata.py b/gguf-py/gguf/scripts/gguf_new_metadata.py
similarity index 100%
rename from gguf-py/scripts/gguf_new_metadata.py
rename to gguf-py/gguf/scripts/gguf_new_metadata.py
diff --git a/gguf-py/scripts/gguf_set_metadata.py b/gguf-py/gguf/scripts/gguf_set_metadata.py
similarity index 100%
rename from gguf-py/scripts/gguf_set_metadata.py
rename to gguf-py/gguf/scripts/gguf_set_metadata.py
diff --git a/gguf-py/pyproject.toml b/gguf-py/pyproject.toml
index 9c3956256..92d7f22ec 100644
--- a/gguf-py/pyproject.toml
+++ b/gguf-py/pyproject.toml
@@ -1,12 +1,11 @@
 [tool.poetry]
 name = "gguf"
-version = "0.13.0"
+version = "0.14.0"
 description = "Read and write ML models in GGUF for GGML"
 authors = ["GGML <ggml@ggml.ai>"]
 packages = [
     {include = "gguf"},
     {include = "gguf/py.typed"},
-    {include = "scripts"},
 ]
 readme = "README.md"
 homepage = "https://ggml.ai"
@@ -33,7 +32,7 @@ requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
-gguf-convert-endian = "scripts:gguf_convert_endian_entrypoint"
-gguf-dump = "scripts:gguf_dump_entrypoint"
-gguf-set-metadata = "scripts:gguf_set_metadata_entrypoint"
-gguf-new-metadata = "scripts:gguf_new_metadata_entrypoint"
+gguf-convert-endian = "gguf.scripts:gguf_convert_endian_entrypoint"
+gguf-dump = "gguf.scripts:gguf_dump_entrypoint"
+gguf-set-metadata = "gguf.scripts:gguf_set_metadata_entrypoint"
+gguf-new-metadata = "gguf.scripts:gguf_new_metadata_entrypoint"