From fdb91395f0822e1d5e9a5bef75a542c67a77a11f Mon Sep 17 00:00:00 2001 From: Legends11 <235496468+tickwarden@users.noreply.github.com> Date: Thu, 13 Aug 2026 09:59:32 +0000 Subject: [PATCH 1/3] Fix dp-depman --- scripts/dp-depman/datapack_depends.json | 8 +++--- scripts/dp-depman/datapack_depends.lock | 12 ++++----- .../example-pack/datapack_depends.json | 24 +++++++++++++----- scripts/dp-depman/example-pack/pack.mcmeta | 4 +-- .../__pycache__/_dp_common.cpython-312.pyc | Bin 0 -> 6440 bytes scripts/dp-depman/scripts/depend_edit.py | 2 +- scripts/dp-depman/scripts/dp-resolve.py | 4 +++ 7 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 scripts/dp-depman/scripts/__pycache__/_dp_common.cpython-312.pyc diff --git a/scripts/dp-depman/datapack_depends.json b/scripts/dp-depman/datapack_depends.json index aa713ed..2d2fc73 100644 --- a/scripts/dp-depman/datapack_depends.json +++ b/scripts/dp-depman/datapack_depends.json @@ -20,9 +20,9 @@ "dependencies": { "dataLib": { "source": "github", - "repo": "runtoolkit/dataLib", - "version": ">=v6.0.0", - "asset": "dataLib-full.zip" + "repo": "runtoolkit/suite", + "version": "v6.0.2", + "asset": "dataLib-dp-datapacks-dataLib.zip" } } -} +} \ No newline at end of file diff --git a/scripts/dp-depman/datapack_depends.lock b/scripts/dp-depman/datapack_depends.lock index 6b4fd8c..19712cf 100644 --- a/scripts/dp-depman/datapack_depends.lock +++ b/scripts/dp-depman/datapack_depends.lock @@ -2,11 +2,11 @@ "resolved": { "dataLib": { "source": "github", - "repo": "runtoolkit/dataLib", - "version": "6.0.0", - "asset_name": "dataLib-full.zip", - "download_url": "https://github.com/runtoolkit/dataLib/releases/download/v6.0.0/dataLib.zip", - "sha256": "c2f5cf679ce371b943b26998f0bfc803f0f1b4ba885aca4cd012b2c12df9629a" + "repo": "runtoolkit/suite", + "version": "6.0.2", + "asset_name": "dataLib-dp-datapacks-dataLib.zip", + "download_url": "https://github.com/runtoolkit/suite/releases/download/packs-latest/dataLib-dp-datapacks-dataLib.zip", + "sha256": "1318baefc36b27a0b53c0459b5e8d06c0d5c06fec0134ca3b03f8c603ab84246" } } -} +} \ No newline at end of file diff --git a/scripts/dp-depman/example-pack/datapack_depends.json b/scripts/dp-depman/example-pack/datapack_depends.json index 593fd0f..712e745 100644 --- a/scripts/dp-depman/example-pack/datapack_depends.json +++ b/scripts/dp-depman/example-pack/datapack_depends.json @@ -1,18 +1,28 @@ { - "id": "example-pack", + "id": "examplePack", "version": "1.0.0", - "description": "Demonstration datapack for dp-depman", + "description": "Example datapack dependency config", "build": { - "output": "both" + "output": "both", + "exclude": [ + ".git", + ".github", + ".dp-cache", + "dist", + "datapack_depends.json", + "datapack_depends.lock", + "*.md", + "scripts/" + ] }, "dependencies": { "dataLib": { "source": "github", - "repo": "runtoolkit/dataLib", - "version": ">=v6.0.0", - "asset": "dataLib-full.zip" + "repo": "runtoolkit/suite", + "version": ">=v6.0.2", + "asset": "dataLib-dp-datapacks-dataLib.zip" } } -} +} \ No newline at end of file diff --git a/scripts/dp-depman/example-pack/pack.mcmeta b/scripts/dp-depman/example-pack/pack.mcmeta index 0615073..4303bc0 100644 --- a/scripts/dp-depman/example-pack/pack.mcmeta +++ b/scripts/dp-depman/example-pack/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { "description": "example-pack — demonstrates dp-depman dependency system", - "min_format": 61, - "max_format": 88 + "min_format": 107, + "max_format": 107 } } diff --git a/scripts/dp-depman/scripts/__pycache__/_dp_common.cpython-312.pyc b/scripts/dp-depman/scripts/__pycache__/_dp_common.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3b15b3d7323f12c4f4ca2540eceb3d73803ae4da GIT binary patch literal 6440 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 VisaaQbeSA0lA-zGTV#ld`9BX8e`Npw literal 0 HcmV?d00001 diff --git a/scripts/dp-depman/scripts/depend_edit.py b/scripts/dp-depman/scripts/depend_edit.py index b4e20c4..224f1d2 100644 --- a/scripts/dp-depman/scripts/depend_edit.py +++ b/scripts/dp-depman/scripts/depend_edit.py @@ -28,7 +28,7 @@ VALID_SOURCES = {"github", "submodule"} -CONSTRAINT_RE = r"^(\d+\.\d+(\.\d+)*(\.x)?|[><=~^]+\d+\.\d+(\.\d+)*)$" +CONSTRAINT_RE = r"^(\*|\d+\.\d+(\.\d+)*(\.x)?|[><=~^]+\d+\.\d+(\.\d+)*)$" def validate_dep(dep_id: str, dep_cfg: dict): import re diff --git a/scripts/dp-depman/scripts/dp-resolve.py b/scripts/dp-depman/scripts/dp-resolve.py index 86c7fcb..6aba62a 100644 --- a/scripts/dp-depman/scripts/dp-resolve.py +++ b/scripts/dp-depman/scripts/dp-resolve.py @@ -48,7 +48,11 @@ def version_matches(version: str, constraint: str) -> bool: "1.2.x" → wildcard patch "^1.2.0" → major fixed "~1.2.0" → major+minor fixed + "*" → any version """ + if constraint == "*": + return True + version = version.lstrip("v") v = parse_version(version) From 5cd4bf6032143cbc659fda8d676087b48c8bb781 Mon Sep 17 00:00:00 2001 From: Legends11 <235496468+tickwarden@users.noreply.github.com> Date: Thu, 13 Aug 2026 13:13:05 +0300 Subject: [PATCH 2/3] Delete scripts/dp-depman/scripts/__pycache__ directory --- .../__pycache__/_dp_common.cpython-312.pyc | Bin 6440 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 scripts/dp-depman/scripts/__pycache__/_dp_common.cpython-312.pyc diff --git a/scripts/dp-depman/scripts/__pycache__/_dp_common.cpython-312.pyc b/scripts/dp-depman/scripts/__pycache__/_dp_common.cpython-312.pyc deleted file mode 100644 index 3b15b3d7323f12c4f4ca2540eceb3d73803ae4da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6440 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 VisaaQbeSA0lA-zGTV#ld`9BX8e`Npw From 0b6046a090020f63ea7da99be56f6057e9b3835a Mon Sep 17 00:00:00 2001 From: Legends11 <235496468+tickwarden@users.noreply.github.com> Date: Thu, 13 Aug 2026 13:17:38 +0300 Subject: [PATCH 3/3] Fix version constraint handling in dp-resolve.py --- scripts/dp-depman/scripts/dp-resolve.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/dp-depman/scripts/dp-resolve.py b/scripts/dp-depman/scripts/dp-resolve.py index 6aba62a..868b1d9 100644 --- a/scripts/dp-depman/scripts/dp-resolve.py +++ b/scripts/dp-depman/scripts/dp-resolve.py @@ -54,6 +54,7 @@ def version_matches(version: str, constraint: str) -> bool: return True version = version.lstrip("v") + constraint = constraint.lstrip("v") v = parse_version(version) if re.match(r"^\d+\.\d+(\.\d+)*$", constraint):