#3522: fix python home conflict (#12112)

commit.ref

@@ -1 +1 @@
-Subproject commit e11e129cdaa05b3324f06072ea419a42b6d1cd18
+Subproject commit 6eb1eb722af06b94027994b2ef8955e84fd97d7f

commit.yml

@@ -2,34 +2,70 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-ui:
-    newFile: !uuid 'ffd8d8bd6fdce75e6317be993842cbf4d110bb14'
-    oldFile: !uuid '5200e10af7d09991341d62eac48f4693ac39c5f7'
-  /dolphinscheduler-ui/src:
-    newFile: !uuid '6f34324746fa0488959ec4dd0684cbb021a1bd24'
-    oldFile: !uuid '970815b2ea0de0aa5da37c3b8ee7883fef178014'
-  /dolphinscheduler-ui/src/views:
-    newFile: !uuid '51c06203c64f0a7929efd8934d498f983e146442'
-    oldFile: !uuid 'aa696a767066921c4d6878efb627f74b7b1cb789'
-  /dolphinscheduler-ui/src/views/projects:
-    newFile: !uuid '3d1b079068b158dc2a8c0fc1334ba0aa007d68b1'
-    oldFile: !uuid '0460bb62d7d1ed5f19990e0bf77b1d8100aaf962'
-  /dolphinscheduler-ui/src/views/projects/task:
-    newFile: !uuid '5fae0c5c487f62b73b36ecbc8cb97b764c155dfd'
-    oldFile: !uuid '15b602c053c53b24f0ce30673723bac25a6219c6'
-  /dolphinscheduler-ui/src/views/projects/task/components:
-    newFile: !uuid '57709914524ff078d0cb64d49755285c75790525'
-    oldFile: !uuid 'c942cdd542639e509e37be66f9e1654ee80ce2db'
-  /dolphinscheduler-ui/src/views/projects/task/components/node:
-    newFile: !uuid '77f3d0bd0e0b6d8479d63a220bd2c77c71185c30'
-    oldFile: !uuid '6d9527be5e658f919a4ff3f0cae6c5027fc65396'
-  /dolphinscheduler-ui/src/views/projects/task/components/node/fields:
-    newFile: !uuid 'a8ed46dc2977cf7ef189f49ea356cdc5a8074898'
-    oldFile: !uuid 'e2fc279c04e21f74f396cf5e35dc5c7e96342e3e'
-  /dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-rules.ts:
-    newFile: !uuid '364e3a32fe52d5bf39d7bb3884b313de71839e73'
-    oldFile: !uuid 'dde32cbc624ccae1d639561f2cca8342829bf8c9'
-gitCommitId: !uuid 'e11e129cdaa05b3324f06072ea419a42b6d1cd18'
+  /dolphinscheduler-task-plugin:
+    newFile: !uuid 'ab14d24ec15d26ef7cefccf8c3fff917b7973013'
+    oldFile: !uuid '0080993e5bea41edc9cd9309c501284c5ee3a535'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch:
+    newFile: !uuid '7c4f1b114557703d8ae5490c4b28e41d44001074'
+    oldFile: !uuid '48137e4912c49444d351474e0634dc23ffe7741a'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src:
+    newFile: !uuid '2e0f20e335ee9f566a409ef9811e0a2460916bcf'
+    oldFile: !uuid '9fcea75a8543279ac8d7ebf5c16f3b9055288346'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/main:
+    newFile: !uuid 'e863600ad411d75ff9eaf4ff030b7ec5d2c42514'
+    oldFile: !uuid 'c601557f6e684bbd417c943b42421fd158bcaf10'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/main/java:
+    newFile: !uuid '33cfefb670cb240fd2e315fbed53d2d5d113990e'
+    oldFile: !uuid '995d29c1f81470784ba34155d825ccf15559e16c'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/main/java/org:
+    newFile: !uuid 'd12ee326a9e04a405e936bf89299442df0e9adfd'
+    oldFile: !uuid '4612179926d62b9fe49dbef3633215f36ace804b'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/main/java/org/apache:
+    newFile: !uuid 'bdddadb31cc35639cb130ca072cdd9d5fe671d45'
+    oldFile: !uuid 'f93827a0dca1fee94b0e6fbdaaeb48d40f812ae2'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'a0eb138f9cdebe011fb45fd3e846cc43c95d67e6'
+    oldFile: !uuid 'a3f54f4af8cfefb38da63de14f0be142627191b7'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/main/java/org/apache/dolphinscheduler/plugin:
+    newFile: !uuid '93e8fcf8d111f6a30b939132ebfada9d11804156'
+    oldFile: !uuid '2aabb128cba8cc8adf18f562fe28f196c4d34421'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/main/java/org/apache/dolphinscheduler/plugin/task:
+    newFile: !uuid '4729b8ea80d4e33d19b085c5a0f92b85417c5cdd'
+    oldFile: !uuid '6786bff09a6e2d0455af59d553e85b2161be2ced'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/main/java/org/apache/dolphinscheduler/plugin/task/pytorch:
+    newFile: !uuid '6b7add4057b93308a2246e7b7afafd6f879bd42d'
+    oldFile: !uuid 'f6d4d9282ae0addbf19a3d8db8a3b4fc84dc8f6e'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/main/java/org/apache/dolphinscheduler/plugin/task/pytorch/PythonEnvManager.java
+  : newFile: !uuid '99c24947d3bddd36afdd9f6952d207446b3dcf3c'
+    oldFile: !uuid 'd13e234c336385e1d3a3d50c64d3d52270aaf2c7'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/test:
+    newFile: !uuid 'dd2a1f47777280dffcfc0687fdb16555c7f0dbca'
+    oldFile: !uuid 'dd758ed74e4548308b6f55a89b173cd960cf506a'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/test/java:
+    newFile: !uuid 'dfd071567ef2625773833d343425046df876c532'
+    oldFile: !uuid '4780fce3fc3aca666f8de6750549f4bd7b44141e'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/test/java/org:
+    newFile: !uuid '188472b01eaea2f1770f980981e87e7274c00b42'
+    oldFile: !uuid '342d3c99c66d61f4c5b3c734f30479c942d7b0ef'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/test/java/org/apache:
+    newFile: !uuid '659395a7cb948d064ca1801b62365be5c9a6d6c6'
+    oldFile: !uuid '67f98a8fecf7a8b84a905e28ea049be3397e2063'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/test/java/org/apache/dolphinscheduler:
+    newFile: !uuid '3928df0ba218deebfbc2d42bb0a45e1e5c03b798'
+    oldFile: !uuid '96850edd66ff01d82b219c1a5ea258fd9597fbe0'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/test/java/org/apache/dolphinscheduler/plugin:
+    newFile: !uuid '08ec13074df0a4df5f29e1ab261765451957c508'
+    oldFile: !uuid '53adb59c6ca3b6d1dbdc1847a9a3acecf5e61e1a'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/test/java/org/apache/dolphinscheduler/plugin/task:
+    newFile: !uuid 'cb09a70f75d040cf054bfbf48f2ff1c9907abec9'
+    oldFile: !uuid '737b5189f0d3639c3e404bb0db4f80596fda6045'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/test/java/org/apache/dolphinscheduler/plugin/task/pytorch:
+    newFile: !uuid 'ccf5aa1019317b31706d038272ea7f29ed55d990'
+    oldFile: !uuid 'bbe96621defa90f61032b9c0191b447e12a4f333'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/src/test/java/org/apache/dolphinscheduler/plugin/task/pytorch/PytorchTaskTest.java
+  : newFile: !uuid '86c2d91910def75d619b0e5616899821902a29a8'
+    oldFile: !uuid '835d31fe729690d72628a6a558ba5114590bb75a'
+gitCommitId: !uuid '6eb1eb722af06b94027994b2ef8955e84fd97d7f'
 renames: {
   }
-revisionId: 3521
+revisionId: 3522