Improve PythonPath

shiena · shiena · commit a364c22f60ee · 2025-01-11T21:37:58.000+09:00
diff --git a/Assets/Editor/Tests/TestCallPython.cs b/Assets/Editor/Tests/TestCallPython.cs
@@ -9,7 +9,7 @@ public class TestCallPython
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            PythonLifeCycle.Initialize("test_project");
+            PythonLifeCycle.Initialize();
         }
 
         [OneTimeTearDown]
diff --git a/Assets/Scripts/PythonLifeCycle.cs b/Assets/Scripts/PythonLifeCycle.cs
@@ -9,13 +9,14 @@ public static class PythonLifeCycle
         private const string PythonFolder = "python-3.11.3-embed-amd64";
         private const string PythonDll = "python311.dll";
         private const string PythonZip = "python311.zip";
-        private const string PythonProject = "myproject";
+        private const string MyProject = "myproject";
+        private const string TestProject = "test_project";
 
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
         private static void PythonInitialize()
         {
             Application.quitting += PythonShutdown;
-            Initialize(PythonProject);
+            Initialize();
         }
 
         private static void PythonShutdown()
@@ -24,12 +25,16 @@ private static void PythonShutdown()
             Shutdown();
         }
 
-        public static void Initialize(string appendPythonPath = "")
+        public static void Initialize()
         {
             var pythonHome = $"{Application.streamingAssetsPath}/{PythonFolder}";
-            var appendPath = string.IsNullOrWhiteSpace(appendPythonPath) ? string.Empty : $"{Application.streamingAssetsPath}/{appendPythonPath}";
+            var myProject = $"{Application.streamingAssetsPath}/{MyProject}";
+            var testProject = $"{Application.streamingAssetsPath}/{TestProject}";
             var pythonPath = string.Join(";",
-                $"{appendPath}",
+                $"{myProject}",
+#if UNITY_EDITOR
+                $"{testProject}",
+#endif
                 $"{pythonHome}/Lib/site-packages",
                 $"{pythonHome}/{PythonZip}",
                 $"{pythonHome}"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class TestCallPython`
`9`	`9`	`[OneTimeSetUp]`
`10`	`10`	`public void OneTimeSetUp()`
`11`	`11`	`{`
`12`		`- PythonLifeCycle.Initialize("test_project");`
	`12`	`+ PythonLifeCycle.Initialize();`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`[OneTimeTearDown]`