unity-devkit 0.1.13__py3-none-any.whl → 0.1.14__py3-none-any.whl

unity_devkit/build_unity.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from typing import Annotated
 
 import typer
+from bashrun.bash import bash_output
 from pydantic_settings import BaseSettings
 
 from ci_devkit.cache import restore, save
@@ -15,15 +16,12 @@ from .license_restore import restore_license
 from ci_devkit.setup import configure_git, install_dotnet
 from ci_devkit.setup_oras import install_oras
 from .unity import prepare_unity_project, resolve_unity_build, run_unity_batchmode
-from ci_devkit.git_tags import get_latest_tag_version
 
 
 class Settings(BaseSettings):
     github_workspace: str
 
 
-settings = Settings.model_validate({})
-
 app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 
@@ -40,6 +38,8 @@ def main(
         str, typer.Option(help="Newline-separated KEY=VALUE pairs injected into the Unity build process environment")
     ] = "",
 ) -> None:
+    settings = Settings.model_validate({})
+
     for line in build_env.splitlines():
         entry = line.strip()
         if not entry:
@@ -66,14 +66,18 @@ def main(
     with ci_step("Prepare build"):
         project_config, build_flag, execute_method = resolve_unity_build(project, platform)
         unity_project_path = project_config.path
+        if unity_project_path.resolve() != project_path.resolve():
+            raise SystemExit(
+                f"--project-path {project_path} does not match catalog entry '{project}' at {unity_project_path}"
+            )
 
     with ci_step("Prepare project"):
         prepare_unity_project(unity_project_path)
 
-    with ci_step(f"Build {unity_project_path.name} [{platform}]"):
+    with ci_step(f"Build {project} [{platform}]"):
         tag_prefix = project_config.tag_prefix
         if tag_prefix:
-            version = get_latest_tag_version(f"{tag_prefix}-v") or "0.0.0"
+            version = latest_tag_version(f"{tag_prefix}-v") or "0.0.0"
             full_version = f"{version}-dev+{run_number}" if branch != "main" else f"{version}+{run_number}"
             version_file = unity_project_path / ".build-version.json"
             version_file.write_text(json.dumps({"version": full_version, "runNumber": run_number}))
@@ -100,3 +104,10 @@ def main(
                 for file in build_directory.rglob("*"):
                     if file.suffix in {".apk", ".exe"}:
                         shutil.copy2(file, artifact_directory / file.name)
+
+
+def latest_tag_version(prefix: str) -> str | None:
+    output = bash_output(f'git tag --list "{prefix}*" --sort=-v:refname').strip()
+    if not output:
+        return None
+    return output.splitlines()[0][len(prefix) :]

unity_devkit/compile_unity.py

@@ -10,9 +10,7 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 @app.command()
 def compile_unity(
-    project: Annotated[
-        str, typer.Option(help="Unity project name (directory containing ProjectSettings/ProjectVersion.txt)")
-    ],
+    project: Annotated[str, typer.Option(help="Unity project name (catalog key in unity-devkit.json)")],
     build: Annotated[str, typer.Option(help="Build target from the project's builds list (e.g. android-mobile)")],
 ) -> None:
     for artifact in build_unity_project(project, build):

unity_devkit/install.py

@@ -9,7 +9,7 @@ import typer
 from bashrun.bash import bash, bash_check, bash_handoff, bash_output
 
 from .compile_unity import build_unity_project
-from .projects import load_unity_projects
+from .projects import load_catalog
 
 INSTALLABLE_TARGETS = {"android-mobile", "magicleap", "linux64"}
 ADB_TARGETS = {"android-mobile", "magicleap"}
@@ -37,7 +37,7 @@ def main(
             "--no-grant-permissions",
             help=(
                 "Skip the post-install `adb shell pm grant` calls listed under `grant_permissions` "
-                "for the project in its unity-build.json manifest. Permissions are granted by default."
+                "for the project's entry in unity-devkit.json. Permissions are granted by default."
             ),
         ),
     ] = False,
@@ -53,7 +53,7 @@ def main(
         ),
     ] = False,
 ) -> None:
-    projects = load_unity_projects()
+    projects = load_catalog()
 
     project_name = next((name for name in projects if name.lower() == project.lower()), None)
     if project_name is None:
@@ -156,7 +156,7 @@ def main(
         if permissions and not no_grant_permissions:
             if not package:
                 raise typer.BadParameter(
-                    f"{project_name} has grant_permissions but no 'package' field in unity-build.json"
+                    f"{project_name} has grant_permissions but no 'package' field in its unity-devkit.json entry"
                 )
             for permission in permissions:
                 print(f"Granting {permission} to {package}")

unity_devkit/lock_unity.py

@@ -2,7 +2,7 @@ from typing import Annotated
 
 import typer
 
-from .projects import load_unity_projects
+from .projects import load_catalog
 from .unity import prepare_unity_project, run_unity_batchmode
 
 app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
@@ -10,7 +10,7 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 @app.command()
 def lock_unity(project: Annotated[str | None, typer.Option(help="Limit to a specific project.")] = None) -> None:
-    config = load_unity_projects()
+    config = load_catalog()
 
     if project is not None and project not in config:
         raise typer.BadParameter(f"Unknown project '{project}'. Valid: {', '.join(config)}")

unity_devkit/matrix.py

@@ -1,12 +1,12 @@
 import json
 from pathlib import Path
 
-from .projects import load_unity_projects
+from .projects import load_catalog
 from .unity import LICENSE_MODULE, PLATFORM_CONFIGS, UNITYCI_IMAGE_REVISION, read_editor_version
 
 
 def main() -> None:
-    projects = load_unity_projects()
+    projects = load_catalog()
     matrix: list[dict[str, str]] = []
     editor_versions: set[str] = set()
 
@@ -28,7 +28,7 @@ def main() -> None:
 
     if not editor_versions:
         raise SystemExit(
-            "No projects with builds declared — unity-matrix needs at least one unity-build.json with a 'builds' list"
+            "No projects with builds declared — unity-matrix needs at least one unity-devkit.json entry with a 'builds' list"
         )
     license_version = max(editor_versions)
     print(f"matrix={json.dumps({'include': matrix})}")

unity_devkit/projects.py

@@ -1,55 +1,50 @@
-import json
 import os
 from collections.abc import Iterator
 from pathlib import Path
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict, Field, TypeAdapter, field_validator
 
-MANIFEST_FILENAME = "unity-build.json"
+CATALOG_FILENAME = "unity-devkit.json"
 PROJECT_MARKER = Path("ProjectSettings") / "ProjectVersion.txt"
 PRUNE_DIRECTORIES = {".git", "Library", "Temp", "obj", "Build", "node_modules", "__pycache__"}
 
 
-class UnityBuildManifest(BaseModel, extra="forbid"):
+class CatalogEntry(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    path: Path
     builds: list[str] | None = None
     execute_methods: dict[str, str] | None = None
     package: str | None = None
-    grant_permissions: list[str] = []
+    grant_permissions: list[str] = Field(default_factory=list)
     tag_prefix: str | None = None
 
+    @field_validator("path")
+    @classmethod
+    def anchor_relative_path(cls, value: Path) -> Path:
+        return value if value.is_absolute() else Path.cwd() / value
 
-class UnityProject(UnityBuildManifest):
-    path: Path
-
-
-def load_unity_projects() -> dict[str, UnityProject]:
-    root = Path.cwd()
-    project_directories = {directory.resolve() for directory in unity_project_directories(root)}
-    manifest_directories = {directory.resolve() for directory in directories_containing(root, MANIFEST_FILENAME)}
-
-    projects: dict[str, UnityProject] = {}
-    for project_path in sorted(project_directories | manifest_directories):
-        if project_path not in project_directories:
-            raise SystemExit(
-                f"{project_path / MANIFEST_FILENAME} is not inside a Unity project: missing {PROJECT_MARKER}"
-            )
 
-        manifest_path = project_path / MANIFEST_FILENAME
-        if manifest_path.exists():
-            manifest = UnityBuildManifest(**json.loads(manifest_path.read_text()))
-        else:
-            manifest = UnityBuildManifest()
+CATALOG_ADAPTER = TypeAdapter(dict[str, CatalogEntry])
 
-        name = project_path.name
-        if name in projects:
-            raise SystemExit(f"Duplicate Unity project name '{name}': {projects[name].path} and {project_path}")
-        projects[name] = UnityProject(path=project_path, **manifest.model_dump())
 
-    if not projects:
+def load_catalog() -> dict[str, CatalogEntry]:
+    catalog_path = Path.cwd() / CATALOG_FILENAME
+    if not catalog_path.is_file():
         raise SystemExit(
-            f"No Unity projects found under {root} — a project is a directory containing {PROJECT_MARKER}. Run from the repo root"
+            f"No {CATALOG_FILENAME} catalog at {catalog_path} — declare Unity projects as catalog entries at the repo root"
         )
-    return projects
+
+    catalog = CATALOG_ADAPTER.validate_json(catalog_path.read_text(encoding="utf-8"))
+    if not catalog:
+        raise SystemExit(f"{catalog_path} declares no projects — at least one catalog entry is required")
+
+    for name, entry in catalog.items():
+        if not (entry.path / PROJECT_MARKER).is_file():
+            raise SystemExit(
+                f"Catalog entry '{name}' points at {entry.path}, which is not a Unity project: missing {PROJECT_MARKER}"
+            )
+    return catalog
 
 
 def visible_directories(root: Path) -> Iterator[Path]:
@@ -60,9 +55,5 @@ def visible_directories(root: Path) -> Iterator[Path]:
         yield Path(directory)
 
 
-def unity_project_directories(root: Path) -> list[Path]:
-    return [directory for directory in visible_directories(root) if (directory / PROJECT_MARKER).is_file()]
-
-
 def directories_containing(root: Path, filename: str) -> list[Path]:
     return [directory for directory in visible_directories(root) if (directory / filename).is_file()]

unity_devkit/test_unity.py

@@ -5,7 +5,7 @@ from typing import Annotated
 
 import typer
 
-from .projects import load_unity_projects
+from .projects import load_catalog
 from .unity import run_unity_batchmode
 
 app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
@@ -13,15 +13,13 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 @app.command()
 def main(
-    project: Annotated[
-        str, typer.Option(help="Unity project name (directory containing ProjectSettings/ProjectVersion.txt)")
-    ],
+    project: Annotated[str, typer.Option(help="Unity project name (catalog key in unity-devkit.json)")],
     test_platform: Annotated[str, typer.Option(help="Unity test platform (EditMode or PlayMode)")] = "EditMode",
     results: Annotated[Path, typer.Option(help="Output path for NUnit XML results")] = Path(
         "artifacts/unity-test-results.xml"
     ),
 ) -> None:
-    projects = load_unity_projects()
+    projects = load_catalog()
     if project not in projects:
         raise SystemExit(f"Unknown project '{project}'. Valid: {', '.join(projects)}")
 

unity_devkit/unity.py

@@ -6,7 +6,7 @@ from typing import TypedDict
 
 from bashrun.bash import CalledProcessError, bash, bash_pipe
 
-from .projects import UnityProject, load_unity_projects
+from .projects import CatalogEntry, load_catalog
 
 
 class PlatformConfig(TypedDict):
@@ -134,8 +134,8 @@ def editor_version(project_path: Path) -> str | None:
     return None
 
 
-def resolve_unity_build(project: str, build: str) -> tuple[UnityProject, str, str]:
-    projects = load_unity_projects()
+def resolve_unity_build(project: str, build: str) -> tuple[CatalogEntry, str, str]:
+    projects = load_catalog()
     if project not in projects:
         raise SystemExit(f"Unknown project '{project}'. Valid: {', '.join(projects)}")
 
@@ -143,7 +143,7 @@ def resolve_unity_build(project: str, build: str) -> tuple[UnityProject, str, st
     valid_builds = project_config.builds or []
     if not valid_builds:
         raise SystemExit(
-            f"Project '{project}' declares no builds — add a unity-build.json with a 'builds' list to {project_config.path}"
+            f"Project '{project}' declares no builds — add a 'builds' list to its entry in unity-devkit.json"
         )
     if build not in valid_builds:
         raise SystemExit(f"Unknown build '{build}' for project '{project}'. Valid: {', '.join(valid_builds)}")
@@ -151,7 +151,7 @@ def resolve_unity_build(project: str, build: str) -> tuple[UnityProject, str, st
     execute_method = (project_config.execute_methods or {}).get(build)
     if not execute_method:
         raise SystemExit(
-            f"No execute method for '{build}' — declare 'execute_methods' in {project_config.path / 'unity-build.json'}"
+            f"No execute method for '{build}' — declare it under 'execute_methods' for '{project}' in unity-devkit.json"
         )
 
     if build not in PLATFORM_CONFIGS:

{unity_devkit-0.1.13.dist-info → unity_devkit-0.1.14.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.5
 Name: unity-devkit
-Version: 0.1.13
-Summary: Unity project discovery, build, license, and CI tooling
+Version: 0.1.14
+Summary: Unity build, license, and CI tooling
 License-File: LICENSE
 License-File: NOTICE
 Requires-Python: >=3.13

unity_devkit-0.1.14.dist-info/RECORD

@@ -0,0 +1,18 @@
+unity_devkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+unity_devkit/build_unity.py,sha256=N4cN8r2IpJBAlkKecwJ3TrrkAQTDZTditZMGW3nE_Qo,4612
+unity_devkit/compile_unity.py,sha256=tW0iSmjhjsJE3Nr_JozeJQZFKD1Ht-EXvSJgqXQKdOI,1784
+unity_devkit/install.py,sha256=emtTnc6TeiACIuQkrk66f5zEVVD3dNUI5SIaZFmMgpE,6954
+unity_devkit/license.py,sha256=iiMdos8kMk4p5uYYroIWUzxvusXtcMRdPkIDXsYTC9c,1484
+unity_devkit/license_restore.py,sha256=Tbt2Kt1axszqj4H6K5Fx9_nqRL-dpL5XTVnxnmP4PZw,1077
+unity_devkit/lock_unity.py,sha256=nxZKAYd73wkOc9zWRhzywG-oDXVB88lxX7WwSVNP0Iw,995
+unity_devkit/matrix.py,sha256=VzIiX4jBgu0DK2i5fmzmNsCdI_9M9evQQAZNPj5tafM,1336
+unity_devkit/projects.py,sha256=DQsudfDOL7loCkGmQyleelzrrarwzJyMMbC4zrfoLS4,2156
+unity_devkit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+unity_devkit/test_unity.py,sha256=Rpd_sV9gSd4-_TNhSZt_QiF32sHYN2rcHQEdiQIuGjY,1049
+unity_devkit/unity.py,sha256=ebxRLwuFfbh7P4ztWgu5qT6zIYkUESfk8XuFhSt83bk,7012
+unity_devkit-0.1.14.dist-info/METADATA,sha256=eGyhNUjb5m9-6uMsWezRSRWB6ldZlQa7SvBWG3Q2TKw,333
+unity_devkit-0.1.14.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+unity_devkit-0.1.14.dist-info/entry_points.txt,sha256=RKjFLiz02NSodLcgVDp8pnYX6zEa7VhrH_1GXnnt9d8,381
+unity_devkit-0.1.14.dist-info/licenses/LICENSE,sha256=RFhQPdSOiMTguUX7JSoIuTxA7HVzCbj_p8WU36HjUQQ,10947
+unity_devkit-0.1.14.dist-info/licenses/NOTICE,sha256=jvglZza3GCdN7v4_TLuXUqX9C_uABlwAKUkcIeKwk_8,26
+unity_devkit-0.1.14.dist-info/RECORD,,

unity_devkit-0.1.13.dist-info/RECORD

@@ -1,18 +0,0 @@
-unity_devkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-unity_devkit/build_unity.py,sha256=2DWbaI8UROzGS_iKa-mXjD7jzNxPNyQvHSa6F_2t-c0,4197
-unity_devkit/compile_unity.py,sha256=PgLiHLiaFFXAuFsu2NLjVSJcvs_QFUyiHVp47nFDwdY,1821
-unity_devkit/install.py,sha256=k0AXeFt-B1yj-Aq5vgvcol9X1KnNa3x74tQNjV1-XSc,6961
-unity_devkit/license.py,sha256=iiMdos8kMk4p5uYYroIWUzxvusXtcMRdPkIDXsYTC9c,1484
-unity_devkit/license_restore.py,sha256=Tbt2Kt1axszqj4H6K5Fx9_nqRL-dpL5XTVnxnmP4PZw,1077
-unity_devkit/lock_unity.py,sha256=9UNMTj5ekFqqyXpRZ4fSru6SeyTda23jqtJ48rb0HOs,1009
-unity_devkit/matrix.py,sha256=fveZkT7O2Q9UD9SW4fL59X6dTfk87RswWLuIs9NwKUM,1343
-unity_devkit/projects.py,sha256=4JJimKo6-GB0EhhVddO-DbbYfNYPKRJfMFbw8_ZgpQY,2577
-unity_devkit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-unity_devkit/test_unity.py,sha256=DaWItN6CqEaPHJRg8fkGTVx9whZt-rLzR1pY9Qhj9DE,1100
-unity_devkit/unity.py,sha256=TDIhW9LVMmBmuJF17QgB3XWjBMHrr2sHp5TAw4Eq-Po,7041
-unity_devkit-0.1.13.dist-info/METADATA,sha256=IA23T3RKoVzwSwMLMw1wgVlgmqweC6A0aOlJd0hU_Us,352
-unity_devkit-0.1.13.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-unity_devkit-0.1.13.dist-info/entry_points.txt,sha256=RKjFLiz02NSodLcgVDp8pnYX6zEa7VhrH_1GXnnt9d8,381
-unity_devkit-0.1.13.dist-info/licenses/LICENSE,sha256=RFhQPdSOiMTguUX7JSoIuTxA7HVzCbj_p8WU36HjUQQ,10947
-unity_devkit-0.1.13.dist-info/licenses/NOTICE,sha256=jvglZza3GCdN7v4_TLuXUqX9C_uABlwAKUkcIeKwk_8,26
-unity_devkit-0.1.13.dist-info/RECORD,,