unitytk 0.0.12__tar.gz → 0.0.14__tar.gz

{unitytk-0.0.12/unitytk.egg-info → unitytk-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitytk
-Version: 0.0.12
+Version: 0.0.14
 Summary: A modular Python toolkit for Unity interaction.
 Author-email: Ryan Simpson <m3trik@outlook.com>
 License: MIT
@@ -8,14 +8,16 @@ Project-URL: Homepage, https://github.com/m3trik/unitytk
 Project-URL: Repository, https://github.com/m3trik/unitytk
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pythontk>=0.7.71
+Requires-Dist: pythontk>=0.12.0
 Dynamic: license-file
 
 [![Tests](https://img.shields.io/badge/Tests-146%20passed-brightgreen.svg)](../test/)
+![Platform](https://img.shields.io/badge/Platform-Windows%2C%20Linux-lightgrey.svg)
 
 # unitytk
 

{unitytk-0.0.12 → unitytk-0.0.14}/docs/README.md

@@ -1,4 +1,5 @@
 [![Tests](https://img.shields.io/badge/Tests-146%20passed-brightgreen.svg)](../test/)
+![Platform](https://img.shields.io/badge/Platform-Windows%2C%20Linux-lightgrey.svg)
 
 # unitytk
 

{unitytk-0.0.12 → unitytk-0.0.14}/pyproject.toml

@@ -12,9 +12,17 @@ requires-python = ">=3.9"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX :: Linux",
 ]
-dependencies = ["pythontk>=0.7.71"]
+# The floor is HAND-RATCHETED: unitytk is off-chain from m3trik/push.ps1, so no
+# release cascade bumps it.
+# pythontk 0.12.0, the release this one ships and was tested with. The hard
+# minimum is 0.8.84: UnityFinder.find_editors scans through
+# `AppLauncher.scan_install_dirs` (new in 0.8.72) and needs its pattern order to
+# be a priority (0.8.84), so the Hub's chosen install location wins over the
+# default. Below 0.8.72 the scan fails, is logged, and no editor is found.
+dependencies = ["pythontk>=0.12.0"]
 
 [project.urls]
 Homepage = "https://github.com/m3trik/unitytk"

{unitytk-0.0.12 → unitytk-0.0.14}/test/test_asset_delivery.py

@@ -6,11 +6,10 @@ import shutil
 import tempfile
 import unittest
 
-from pythontk.core_utils.app_handoff import HandoffRequest, Payload
+from pythontk import HandoffRequest, Payload
 from unitytk.asset_delivery import (
     CopyToAssetsDeliverer,
     FileToUnityBridge,
-    CopyToAssetsDeliverer,
 )
 
 

{unitytk-0.0.12 → unitytk-0.0.14}/test/test_audio_events_integration.py

@@ -25,7 +25,6 @@ Requires:
     - Unity Hub with at least one editor installed
 """
 import os
-import sys
 import json
 import shutil
 import unittest

{unitytk-0.0.12 → unitytk-0.0.14}/test/test_base_test.py

@@ -356,7 +356,7 @@ class SuiteOptionsTest(unittest.TestCase):
 
 
 class TestAssetsTest(unittest.TestCase):
-    """Fixture resolution, including the one-release legacy-name alias map."""
+    """Fixture resolution: a plain join under ``UNITYTK_TEST_ASSETS``."""
 
     def setUp(self):
         import tempfile
@@ -368,41 +368,15 @@ class TestAssetsTest(unittest.TestCase):
         patcher.start()
         self.addCleanup(patcher.stop)
 
-    def _touch(self, *parts):
-        path = os.path.join(self.root, *parts)
-        os.makedirs(os.path.dirname(path), exist_ok=True)
-        with open(path, "w", encoding="utf-8") as fh:
-            fh.write("x")
-        return path
-
     def test_path_joins_under_the_root(self):
         self.assertEqual(
             TestAssets.path("a", "b.fbx"), os.path.join(self.root, "a", "b.fbx")
         )
 
-    def test_alias_map_is_not_empty(self):
-        self.assertTrue(TestAssets.LEGACY_ALIASES)
-
-    def test_legacy_name_resolves_when_only_it_is_staged(self):
-        """An already-staged asset tree keeps working for one release."""
-        for new_parts, legacy_parts in TestAssets.LEGACY_ALIASES.items():
-            with self.subTest(asset=new_parts):
-                staged = self._touch(*legacy_parts)
-                try:
-                    self.assertEqual(
-                        os.path.normcase(TestAssets.path(*new_parts)),
-                        os.path.normcase(staged),
-                    )
-                finally:
-                    os.remove(staged)
-
-    def test_new_name_wins_when_both_are_staged(self):
-        new_parts, legacy_parts = next(iter(TestAssets.LEGACY_ALIASES.items()))
-        self._touch(*legacy_parts)
-        fresh = self._touch(*new_parts)
-        self.assertEqual(
-            os.path.normcase(TestAssets.path(*new_parts)), os.path.normcase(fresh)
-        )
+    def test_the_one_release_alias_map_is_gone(self):
+        """Deleted 2026-09-23, as its own note asked: nothing maps a neutral
+        fixture name to a legacy one, so ``path`` is the plain join above."""
+        self.assertFalse(hasattr(TestAssets, "LEGACY_ALIASES"))
 
     def test_unset_root_cannot_exist_under_either_guard(self):
         from pathlib import Path
@@ -566,17 +540,13 @@ class PublicHygieneTest(unittest.TestCase):
     The absolute studio paths, vendor name and person name went 2026-08-15; the
     program identifiers went 2026-08-17. This is the guard that keeps them out.
     Markdown is deliberately NOT scanned: ``CHANGELOG.md`` records what factually
-    happened and ``CLAUDE.md`` has to document the legacy asset names so a user
-    can rename an already-staged tree.
+    happened. Since the one-release alias map went (2026-09-23), no Python or C#
+    file may name the legacy assets -- ``base_test.py`` included.
     """
 
     #: Program identifiers that must not appear as code identifiers.
     PROGRAM_RE = re.compile(r"C-?130|C5M|FCR", re.IGNORECASE)
 
-    #: The one file allowed to name the legacy assets: the deprecation alias
-    #: map, which exists precisely so the old names keep resolving.
-    ALIAS_HOME = "base_test.py"
-
     def test_no_module_filename_carries_a_program_identifier(self):
         offenders = [
             os.path.relpath(p, REPO_ROOT)
@@ -587,7 +557,7 @@ class PublicHygieneTest(unittest.TestCase):
 
     def test_no_program_identifier_in_python_or_cs_source(self):
         offenders = []
-        for path in _source_files(".py", ".cs", exclude=(self.ALIAS_HOME,)):
+        for path in _source_files(".py", ".cs"):
             with open(path, encoding="utf-8", errors="replace") as fh:
                 for lineno, line in enumerate(fh, 1):
                     if self.PROGRAM_RE.search(line):
@@ -596,22 +566,6 @@ class PublicHygieneTest(unittest.TestCase):
                         )
         self.assertEqual(offenders, [], f"program identifier in source: {offenders}")
 
-    def test_the_alias_map_is_the_only_home_for_the_legacy_names(self):
-        """base_test may name them -- but only inside LEGACY_ALIASES."""
-        legacy = [part for parts in TestAssets.LEGACY_ALIASES.values() for part in parts]
-        self.assertTrue(
-            any(self.PROGRAM_RE.search(p) for p in legacy),
-            "the alias map should be carrying the legacy program-identified names",
-        )
-        path = os.path.join(os.path.dirname(base_test.__file__), self.ALIAS_HOME)
-        with open(path, encoding="utf-8") as fh:
-            source = fh.read()
-        start = source.index("LEGACY_ALIASES")
-        end = source.index("@classmethod", start)
-        outside = source[:start] + source[end:]
-        hits = sorted({m.group(0) for m in self.PROGRAM_RE.finditer(outside)})
-        self.assertEqual(hits, [], f"legacy identifier outside the alias map: {hits}")
-
 
 if __name__ == "__main__":
     unittest.main()

{unitytk-0.0.12 → unitytk-0.0.14}/test/test_clip_name_contract_integration.py

@@ -2,19 +2,21 @@
 # coding=utf-8
 """Integration test: the Maya→Unity clip-name JOIN contract under stress.
 
-The whole shots→Unity scheme hinges on one identity: the FBX take name == the
-imported ``AnimationClip.name`` == the ``shot_metadata`` ``clip`` join key.  Maya
-guarantees the first equality (single resolution) and sanitizes to strictly
-``[A-Za-z0-9_]``; this test proves the *second* — that Unity preserves such names
-verbatim on FBX import — for the cases most likely to diverge: a space, embedded
-punctuation, a leading digit, and an exact collision (de-duped with a suffix).
+The whole shots→Unity scheme hinges on one identity: the shot name == the FBX
+take name == the imported ``AnimationClip.name`` == the ``shot_metadata`` ``clip``
+join key.  The store refuses any name outside ``ShotStore.NAME_PATTERN``
+(``[A-Za-z0-9_]``, unique ignoring case) instead of respelling it on export, so
+what the user typed is what ships.  This test proves both halves end to end:
+Maya refuses the names the carrier would respell, and every name it accepts
+arrives in Unity VERBATIM -- including the forms the pre-2026-09-18 respelling
+collapsed or stripped (a doubled ``_``, a trailing ``_``), a leading digit and
+a leading ``_``.
 
 If Unity ever re-sanitized clip names (e.g. stripped a leading digit), the join
 would silently break and ``ShotMetadataController.GetShot`` would return null; this
 test is the guard against that.
 """
 import os
-import sys
 import json
 import shutil
 import unittest
@@ -36,14 +38,16 @@ from unitytk import UnityLauncher, UnityFinder, TemplateDeployer
 #: any other machine while the run still reported green.
 MAYAPY = MayaEnv.mayapy()
 
-# Authored shot name -> expected sanitized clip key (Maya side, verified by the
-# mayatk pure tests).  Unity must reproduce these exactly as clip names.
-EXPECTED = {
-    "01 Start": "01_Start",      # leading digit + space
-    "Fade-In!": "Fade_In",       # punctuation
-    "Wipe Out": "Wipe_Out",      # space
-    "Wipe Out!": "Wipe_Out_1",   # collides with "Wipe Out" -> suffixed
-}
+# Names the store accepts; each must be the clip key AND the Unity clip name,
+# character for character.
+NAMES = [
+    "01_Start",  # leading digit
+    "Fade__In",  # doubled underscore (the legacy respelling collapsed it)
+    "Wipe_Out_",  # trailing underscore (the legacy respelling stripped it)
+    "_Lead",  # leading underscore
+]
+# Names the store refuses rather than let the export respell them.
+REFUSED = ["01 Start", "Fade-In!", "fade__in"]  # space, punctuation, case twin
 
 
 def _unity_available() -> bool:
@@ -60,8 +64,10 @@ maya.standalone.initialize(name="python")
 import maya.cmds as cmds
 import maya.mel as mel
 
+import pythontk as ptk
 from mayatk.anim_utils.shots._shots import ShotStore
 from mayatk.env_utils.fbx_utils import FbxUtils
+from mayatk.node_utils.data_nodes import DataNodes
 
 output_dir = sys.argv[1]
 fbx_path = os.path.join(output_dir, "clip_name_contract.fbx").replace(os.sep, "/")
@@ -77,16 +83,24 @@ for t, v in ((1, 0.0), (5, 1.0), (10, 2.0), (15, 3.0), (20, 4.0),
 
 store = ShotStore()
 ShotStore.set_active(store)
-# Order is significant: "Wipe Out" before "Wipe Out!" so the collision suffixes
-# the second one (matches the deterministic resolve over sorted order).
-store.define_shot("01 Start", 1, 10)
-store.define_shot("Fade-In!", 11, 20)
-store.define_shot("Wipe Out", 21, 30)
-store.define_shot("Wipe Out!", 31, 40)
+names = json.loads(sys.argv[2])
+for i, name in enumerate(names):
+    store.define_shot(name, 1 + 10 * i, 10 + 10 * i)
+refused = []
+for name in json.loads(sys.argv[3]):
+    try:
+        store.define_shot(name, 41, 45)
+    except ValueError:
+        refused.append(name)
 
 view = store.to_export_view()
 store.publish_export_view()
 n_takes = FbxUtils.apply_takes_from_node()
+# The take list the split realizes, read back off the carrier through the ONE
+# reader of it (each shot_metadata clip's own range).
+takes = ptk.SceneRecords.declared_takes(
+    lambda key: ptk.SceneRecords.resolve(key).load(DataNodes)
+)
 
 if not cmds.pluginInfo("fbxmaya", query=True, loaded=True):
     cmds.loadPlugin("fbxmaya")
@@ -98,7 +112,9 @@ results = {
     "fbx_path": fbx_path,
     "fbx_exists": os.path.exists(fbx_path),
     "n_takes": n_takes,
-    "clip_keys": [t["name"] for t in view["fbx_takes"]],
+    "clip_keys": [t["name"] for t in takes],
+    "meta_keys": [s["clip"] for s in view["shot_metadata"]["shots"]],
+    "refused": refused,
 }
 with open(os.path.join(output_dir, "maya_results.json"), "w") as f:
     json.dump(results, f, indent=2)
@@ -214,7 +230,7 @@ class TestClipNameContract(unittest.TestCase):
         )
         env["PYTHONIOENCODING"] = "utf-8"
         proc = subprocess.run(
-            [MAYAPY, script_path, self.temp_dir],
+            [MAYAPY, script_path, self.temp_dir, json.dumps(NAMES), json.dumps(REFUSED)],
             capture_output=True, text=True, timeout=180, env=env,
         )
         if proc.stderr:
@@ -226,9 +242,12 @@ class TestClipNameContract(unittest.TestCase):
         r = self.__class__.maya_results
         self.__class__.fbx_path = r["fbx_path"]
         self.assertTrue(r["fbx_exists"])
-        self.assertEqual(r["n_takes"], 4)
-        # Maya half already produced the expected sanitized keys.
-        self.assertEqual(set(r["clip_keys"]), set(EXPECTED.values()))
+        self.assertEqual(r["n_takes"], len(NAMES))
+        # The Maya half: every refused name was refused, every accepted name
+        # is its own take and join key, unchanged and in order.
+        self.assertEqual(r["refused"], REFUSED)
+        self.assertEqual(r["clip_keys"], NAMES)
+        self.assertEqual(r["meta_keys"], NAMES)
 
     @MayaEnv.skip_unless_available()
     @EnvSkip.unless(_unity_available(), "no Unity editor found")
@@ -304,18 +323,17 @@ class TestClipNameContract(unittest.TestCase):
         clip_names = set(unity.get("clip_names", []))
         clip_keys = set(unity.get("clip_keys", []))
 
-        # Every expected sanitized name imported as a clip with that exact name —
-        # space→_, punctuation→_, leading digit, and collision suffix all survive
-        # Unity's FBX import verbatim.  (Unity also imports a default "Take 001"
-        # clip for the full baked timeline; it carries no shot record and is
-        # ignored by the join — so this is a superset check, not equality.)
-        for sanitized in EXPECTED.values():
+        # Every authored name imported as a clip with that exact name.  (Unity
+        # also imports a default "Take 001" clip for the full baked timeline; it
+        # carries no shot record and is ignored by the join — so this is a
+        # superset check, not equality.)
+        for name in NAMES:
             self.assertIn(
-                sanitized, clip_names,
-                f"Unity altered/dropped clip {sanitized!r}; imported: {sorted(clip_names)}",
+                name, clip_names,
+                f"Unity altered/dropped clip {name!r}; imported: {sorted(clip_names)}",
             )
-        # Metadata keys are exactly the four shots, and each joins to a clip.
-        self.assertEqual(clip_keys, set(EXPECTED.values()))
+        # Metadata keys are exactly the authored shots, and each joins to a clip.
+        self.assertEqual(clip_keys, set(NAMES))
         for key in clip_keys:
             self.assertIn(key, clip_names, f"Join broken: key {key!r} has no clip.")
 

{unitytk-0.0.12 → unitytk-0.0.14}/test/test_emissive_groups_integration.py

@@ -7,9 +7,9 @@ transports, curve rebinding, proxy-node deletion) and was the only one with no
 batch-Unity coverage at all. This closes the import-side half:
 
     1. Maya (mayapy): cube → two real ``EmissiveGroups.add_group`` calls with
-       distinct default weights → ``FbxUtils.run_export_preparers()`` (the
-       registered known-producer refresh the Scene Exporter calls, validating
-       the ``_KNOWN_PRODUCERS`` wiring) → export mesh + ``data_export`` carrier.
+       distinct default weights → ``FbxUtils.publish()`` (the one publish of
+       every producer the Scene Exporter makes, validating the
+       ``FbxUtils.PRODUCERS`` wiring) → export mesh + ``data_export`` carrier.
        Then clear the groups and export a SECOND FBX with no channel.
     2. Unity (batchmode): import the first FBX with the real templates
        deployed and verify the populated ``EmissiveGroupController`` on the
@@ -30,7 +30,6 @@ Requires:
     - Unity Hub with at least one editor installed (skips on license wall)
 """
 import os
-import sys
 import json
 import shutil
 import unittest
@@ -70,6 +69,7 @@ import maya.standalone
 maya.standalone.initialize(name="python")
 import maya.cmds as cmds
 
+import pythontk as ptk
 from mayatk.mat_utils.emissive_groups import EmissiveGroups
 from mayatk.env_utils.fbx_utils import FbxUtils
 from mayatk.node_utils.data_nodes import DataNodes
@@ -86,10 +86,10 @@ EmissiveGroups.add_group("taillights", faces=[cube + ".f[2:3]"], default=0.25)
 
 warnings = EmissiveGroups.validate()
 
-# The registered known-producer refresh — exactly what the Scene Exporter
-# calls before an export (validates the _KNOWN_PRODUCERS wiring).
-FbxUtils.run_export_preparers()
-manifest = DataNodes.get_export_string(EmissiveGroups.DATA_CHANNEL)
+# The one publish of every producer -- exactly what the Scene Exporter makes
+# before an export (validates the FbxUtils.PRODUCERS wiring).
+FbxUtils.publish()
+manifest = DataNodes.read(ptk.Scope.DELIVERABLE, EmissiveGroups.DATA_CHANNEL)
 
 if not cmds.pluginInfo("fbxmaya", query=True, loaded=True):
     cmds.loadPlugin("fbxmaya")
@@ -109,8 +109,8 @@ _export(with_path)
 # Second export with the channel gone — drives the stale-removal path.
 for name in list(EmissiveGroups.list_groups()):
     EmissiveGroups.remove_group(name)
-FbxUtils.run_export_preparers()
-cleared = DataNodes.get_export_string(EmissiveGroups.DATA_CHANNEL)
+FbxUtils.publish()
+cleared = DataNodes.read(ptk.Scope.DELIVERABLE, EmissiveGroups.DATA_CHANNEL)
 
 without_path = os.path.join(output_dir, "Lamp_emissive_cleared.fbx")
 _export(without_path)
@@ -233,7 +233,7 @@ class TestEmissiveGroupsIntegration(unittest.TestCase):
 
     @MayaEnv.skip_unless_available()
     def test_01_maya_export(self):
-        """cube → two add_group calls → run_export_preparers → FBX with carrier."""
+        """cube → two add_group calls → FbxUtils.publish → FBX with carrier."""
         script_path = os.path.join(self.temp_dir, "maya_export.py")
         with open(script_path, "w", encoding="utf-8") as f:
             f.write(MAYA_EXPORT_SCRIPT)

{unitytk-0.0.12 → unitytk-0.0.14}/test/test_fade_window_preservation.py

@@ -57,7 +57,7 @@ import maya.standalone
 maya.standalone.initialize(name="python")
 import maya.cmds as cmds
 import maya.mel as mel
-from mayatk import RenderOpacity
+from mayatk import RenderEffects
 
 output_dir = sys.argv[1]
 fbx_path = os.path.join(output_dir, "fade_window.fbx")
@@ -68,12 +68,12 @@ cmds.currentUnit(time="film")
 cmds.playbackOptions(min=1, max=160)
 
 cube = cmds.polyCube(name="WindowCube")[0]
-RenderOpacity.create(objects=[cube], mode="attribute")
+RenderEffects.create(objects=[cube], mode="attribute")
 
 # Short fade-in: frame 1 → 11 (10 frames, 0.417s @ 24fps)
-RenderOpacity.key_fade(objects=[cube], start=1, end=11, direction="in")
+RenderEffects.key_fade(objects=[cube], start=1, end=11, direction="in")
 # Long fade-out: frame 91 → 151 (60 frames, 2.5s @ 24fps)
-RenderOpacity.key_fade(objects=[cube], start=91, end=151, direction="out")
+RenderEffects.key_fade(objects=[cube], start=91, end=151, direction="out")
 
 # Add a translate carrier so the FBX has a clip spanning the timeline
 cmds.setKeyframe(cube, attribute="translateY", time=1, value=0)

{unitytk-0.0.12 → unitytk-0.0.14}/test/test_keyed_visibility.py

@@ -40,9 +40,7 @@ FBX_PATH = asset_path("fixture_keyed_visibility.fbx")
 
 #: Name the FBX is copied to inside the Unity project. Fixed rather than
 #: derived from FBX_PATH so the C# "Assets/<name>" literal and the importer
-#: allowlist stay true whichever name the fixture carries on disk (see
-#: base_test.TestAssets.LEGACY_ALIASES, which keeps the pre-2026-08-17
-#: fixture names resolving for one release).
+#: allowlist stay true whatever the fixture file on disk is called.
 FBX_ASSET_NAME = "fixture_keyed_visibility.fbx"
 
 # Template CS files — need RenderEffectsController for the importer
@@ -87,18 +85,11 @@ EXPECTED_VISIBILITY_OBJECTS = [
 # Unity finder
 # ---------------------------------------------------------------------------
 def _find_unity_exe() -> str:
-    hub = r"C:\Program Files\Unity\Hub\Editor"
-    if not os.path.isdir(hub):
-        return ""
-    versions = sorted(
-        [d for d in os.listdir(hub) if os.path.isdir(os.path.join(hub, d))],
-        reverse=True,
-    )
-    for v in versions:
-        exe = os.path.join(hub, v, "Editor", "Unity.exe")
-        if os.path.isfile(exe):
-            return exe
-    return ""
+    """The newest installed Unity Editor, found the way the product finds it
+    (every Hub install location, on every OS), or ""."""
+    from unitytk.launcher import UnityLauncher
+
+    return UnityLauncher().executable_path or ""
 
 
 # ---------------------------------------------------------------------------
@@ -523,7 +514,7 @@ class TestKeyedVisibility(unittest.TestCase):
                 logger.error(f"Unity log tail:\n{tail}")
                 # Check for compilation errors
                 if "error CS" in log_content:
-                    errors = [l for l in log_content.split("\n") if "error CS" in l]
+                    errors = [ln for ln in log_content.split("\n") if "error CS" in ln]
                     for e in errors[:10]:
                         logger.error(f"  {e.strip()}")
 
@@ -545,7 +536,7 @@ class TestKeyedVisibility(unittest.TestCase):
         self.assertTrue(r.get("import_visibility"), "importVisibility was not enabled")
         self.assertTrue(r.get("import_animation"), "importAnimation was not enabled")
         self.assertFalse(r.get("resample_curves"), "resampleCurves should be OFF")
-        print(f"  Import Settings: visibility=ON, animation=ON, resample=OFF")
+        print("  Import Settings: visibility=ON, animation=ON, resample=OFF")
 
         # Prefab
         self.assertTrue(r.get("prefab_loaded"), "FBX prefab failed to load")
@@ -626,7 +617,7 @@ class TestKeyedVisibility(unittest.TestCase):
         print(f"  Found with curves:          {len(found)}")
         print(f"  MISSING curves:             {len(missing)}")
         if missing:
-            print(f"\n  *** MISSING VISIBILITY CURVES ***")
+            print("\n  *** MISSING VISIBILITY CURVES ***")
             for m in missing:
                 in_hierarchy = any(m in obj for obj in loc_objects)
                 status = "IN HIERARCHY" if in_hierarchy else "NOT IN FBX"
@@ -638,7 +629,7 @@ class TestKeyedVisibility(unittest.TestCase):
         if sample_error:
             print(f"\n  Sampling Error: {sample_error}")
         elif sample_results:
-            print(f"\n  AnimationMode Sampling:")
+            print("\n  AnimationMode Sampling:")
             for sr in sample_results:
                 print(f"    {sr}")
 
@@ -657,8 +648,8 @@ class TestKeyedVisibility(unittest.TestCase):
             print(
                 f"\n  WARNING: {len(missing)} expected objects missing visibility curves"
             )
-            print(f"  These objects may need .visibility keyed directly in Maya")
-            print(f"  (display layer visibility does NOT export to FBX)")
+            print("  These objects may need .visibility keyed directly in Maya")
+            print("  (display layer visibility does NOT export to FBX)")
 
         print("\n  VERDICT: See results above for visibility import status.")
         print("=" * 70 + "\n")

{unitytk-0.0.12 → unitytk-0.0.14}/test/test_launcher.py

@@ -1,7 +1,7 @@
 import unittest
 import os
 import sys
-from unittest.mock import patch, MagicMock
+from unittest.mock import patch
 
 # Ensure unitytk and module imports work whether run directly or via runner
 try:
@@ -15,34 +15,70 @@ from unitytk.launcher import UnityFinder, UnityLauncher
 
 
 class TestUnityLauncher(UnityTkTestCase):
-    @patch("unitytk.launcher.UnityFinder.get_hub_editor_path")
-    @patch("os.listdir")
-    @patch("os.path.isdir")
-    @patch("os.path.exists")
-    @patch("platform.system")
-    def test_find_editors_windows(
-        self, mock_system, mock_exists, mock_isdir, mock_listdir, mock_get_hub
-    ):
-        """Verify that find_editors correctly identifies Unity executables on Windows."""
-        mock_system.return_value = "windows"
-        mock_get_hub.return_value = "C:\\Hub"
-        mock_listdir.return_value = ["2021.1.0f1", "2022.2.0b1"]
-
-        # Mock isdir behavior: return True if path contains the mocked versions
-        mock_isdir.return_value = True
-
-        # Mock existence: Hub exists, and the Unity.exe inside the version folders exist
-        mock_exists.side_effect = lambda p: (
-            True if p == "C:\\Hub" or "Unity.exe" in p else False
+    def test_find_editors_windows(self):
+        """Windows: <Hub>/<ver>/Editor/Unity.exe, found through the shared
+        install scan (a real tree -- no listdir/exists mocks to drift from it).
+        A version folder without the binary is not an editor."""
+        import tempfile
+
+        with tempfile.TemporaryDirectory() as hub:
+            for version in ("2021.1.0f1", "2022.2.0b1"):
+                exe = os.path.join(hub, version, "Editor", "Unity.exe")
+                os.makedirs(os.path.dirname(exe))
+                open(exe, "w").close()
+            os.makedirs(os.path.join(hub, "2023.1.0f1", "Editor"))  # no binary
+            with patch("platform.system", return_value="Windows"), patch(
+                "unitytk.launcher.UnityFinder.get_hub_editor_paths", return_value=[hub]
+            ):
+                editors = UnityFinder.find_editors()
+
+        self.assertEqual(sorted(editors), ["2021.1.0f1", "2022.2.0b1"])
+        self.assertEqual(
+            os.path.normpath(editors["2021.1.0f1"]),
+            os.path.join(hub, "2021.1.0f1", "Editor", "Unity.exe"),
         )
 
-        editors = UnityFinder.find_editors()
-
-        self.assertIn("2021.1.0f1", editors)
-        self.assertIn("2022.2.0b1", editors)
+    def test_find_editors_reads_the_hubs_install_location_on_linux(self):
+        """Linux: ~/Unity/Hub/Editor/<ver>/Editor/Unity, and the location picked
+        in the Hub's preferences (secondaryInstallPath.json, where new installs
+        go) -- scanned first, on every OS. Only the default was ever read."""
+        import json
+        import tempfile
+
+        with tempfile.TemporaryDirectory() as home:
+            default = os.path.join(home, "Unity", "Hub", "Editor")
+            custom = os.path.join(home, "editors")
+            config = os.path.join(home, ".config", "UnityHub")
+            for root, version in ((default, "2022.3.1f1"), (custom, "6000.0.1f1")):
+                exe = os.path.join(root, version, "Editor", "Unity")
+                os.makedirs(os.path.dirname(exe))
+                open(exe, "w").close()
+            os.makedirs(config)
+            with open(os.path.join(config, "secondaryInstallPath.json"), "w") as f:
+                json.dump(custom, f)
+            env = {"HOME": home, "XDG_CONFIG_HOME": os.path.join(home, ".config")}
+
+            def expanduser(path):
+                # A LEADING "~" only, as the real one: the scan expands every
+                # pattern, and a Windows temp dir can hold one mid-path (the
+                # 8.3 name C:\Users\RUNNER~1 on GitHub's runners).
+                return home + path[1:] if path.startswith("~") else path
+
+            with patch("platform.system", return_value="Linux"), patch.dict(
+                os.environ, env
+            ), patch("os.path.expanduser", expanduser):
+                self.assertEqual(
+                    [os.path.normpath(r) for r in UnityFinder.get_hub_editor_paths()],
+                    [custom, default],
+                )
+                editors = {
+                    v: os.path.normpath(e) for v, e in UnityFinder.find_editors().items()
+                }
+        self.assertEqual(
+            editors["6000.0.1f1"], os.path.join(custom, "6000.0.1f1", "Editor", "Unity")
+        )
         self.assertEqual(
-            editors["2021.1.0f1"],
-            os.path.join("C:\\Hub", "2021.1.0f1", "Editor", "Unity.exe"),
+            editors["2022.3.1f1"], os.path.join(default, "2022.3.1f1", "Editor", "Unity")
         )
 
     @patch("unitytk.launcher.UnityFinder.find_editors")