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/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..868b1d9 100644 --- a/scripts/dp-depman/scripts/dp-resolve.py +++ b/scripts/dp-depman/scripts/dp-resolve.py @@ -48,8 +48,13 @@ 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") + constraint = constraint.lstrip("v") v = parse_version(version) if re.match(r"^\d+\.\d+(\.\d+)*$", constraint):