DYN-4800: Bump Python version to 3.9.12 (#12815)

sm6srw · web-flow · commit 2b741382420c · 2022-05-06T13:12:44.000-04:00
* Bump Python to version 3.8.13

* Final version 2.5.1.4255

* Revert version number

* Bump version of pythonnet to 2.5.2.4265, bump python to 3.9.12

* Revert change

* Fix test

* Fix tests.

* Only setup cpython once.
diff --git a/extern/Python/Python.Included.dll b/extern/Python/Python.Included.dll
diff --git a/extern/Python/Python.Runtime.dll b/extern/Python/Python.Runtime.dll
diff --git a/src/Libraries/DSCPython/CPythonEvaluator.cs b/src/Libraries/DSCPython/CPythonEvaluator.cs
@@ -336,7 +336,7 @@ public static object EvaluatePythonScript(
         /// NOTE: Calling SetupPython multiple times will add the install location to the path many times,
         /// potentially causing the environment variable to overflow.
         /// </summary>
-        private static void InstallPython()
+        internal static void InstallPython()
         {
             if (!isPythonInstalled)
             {
diff --git a/src/Libraries/DSCPython/DSCPython.csproj b/src/Libraries/DSCPython/DSCPython.csproj
@@ -10,11 +10,11 @@
     <AssemblyName>DSCPython</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Python.Included, Version=2.5.1.2374, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Python.Included, Version=2.5.2.4265, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\extern\Python\Python.Included.dll</HintPath>
     </Reference>
-    <Reference Include="Python.Runtime, Version=2.5.1.2374, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Python.Runtime, Version=2.5.2.4265, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\extern\Python\Python.Runtime.dll</HintPath>
     </Reference>
diff --git a/src/Libraries/DSCPython/DSCPythonCodeCompletionProviderCore.cs b/src/Libraries/DSCPython/DSCPythonCodeCompletionProviderCore.cs
@@ -72,7 +72,7 @@ import clr
 
         private object ExecutePythonScriptCode(string code)
         {
-            Python.Included.Installer.SetupPython().Wait();
+            DSCPython.CPythonEvaluator.InstallPython();
 
             if (!PythonEngine.IsInitialized)
             {
@@ -376,6 +376,8 @@ public DSCPythonCodeCompletionProviderCore()
             BasicVariableTypes.Add(Tuple.Create(LIST_VARIABLE, typeof(PyList)));
             BasicVariableTypes.Add(Tuple.Create(DICT_VARIABLE, typeof(PyDict)));
 
+            DSCPython.CPythonEvaluator.InstallPython();
+
             if (!PythonEngine.IsInitialized)
             {
                 PythonEngine.Initialize();
diff --git a/src/Libraries/DSCPython/Properties/AssemblyInfo.cs b/src/Libraries/DSCPython/Properties/AssemblyInfo.cs
@@ -10,4 +10,5 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("f1541c2d-80a9-4fe7-8d9e-75a8b9ff3479")]
-[assembly:InternalsVisibleTo("DynamoPythonTests")]
+[assembly: InternalsVisibleTo("PythonMigrationViewExtension")]
+[assembly: InternalsVisibleTo("DynamoPythonTests")]
diff --git a/src/PythonMigrationViewExtension/MigrationAssistant/ScriptMigrator.cs b/src/PythonMigrationViewExtension/MigrationAssistant/ScriptMigrator.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.IO;
 using System.Reflection;
-using Python.Included;
 using Python.Runtime;
 
 namespace Dynamo.PythonMigration.MigrationAssistant
@@ -19,7 +18,7 @@ internal static class ScriptMigrator
         /// <returns></returns>
         internal static string MigrateCode(string code)
         {
-            InstallPython();
+            DSCPython.CPythonEvaluator.InstallPython();
 
             if (!PythonEngine.IsInitialized)
             {
@@ -70,21 +69,6 @@ internal static string MigrateCode(string code)
             }
         }
 
-        private static bool isPythonInstalled = false;
-        /// <summary>
-        /// Makes sure Python is installed on the system and it's location added to the path.
-        /// NOTE: Calling SetupPython multiple times will add the install location to the path many times,
-        /// potentially causing the environment variable to overflow.
-        /// </summary>
-        private static void InstallPython()
-        {
-            if (!isPythonInstalled)
-            {
-                Python.Included.Installer.SetupPythonSync();
-                isPythonInstalled = true;
-            }
-        }
-
         private static string Get2To3MigrationScript(Assembly asm)
         {
             return GetEmbeddedScript(asm, "Dynamo.PythonMigration.MigrationAssistant.migrate_2to3.py");
diff --git a/src/PythonMigrationViewExtension/PythonMigrationViewExtension.csproj b/src/PythonMigrationViewExtension/PythonMigrationViewExtension.csproj
@@ -10,20 +10,15 @@
     <AssemblyName>PythonMigrationViewExtension</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DiffPlex" Version="1.6.3" CopyMetaData="true"/>
+    <PackageReference Include="DiffPlex" Version="1.6.3" CopyMetaData="true" />
 	  <PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
     <Reference Include="PresentationCore">
       <Private>False</Private>
     </Reference>
     <Reference Include="PresentationFramework">
       <Private>False</Private>
     </Reference>
-    <Reference Include="Python.Included, Version=2.5.1.2374, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\extern\Python\Python.Included.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Python.Runtime, Version=2.5.1.2374, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Python.Runtime, Version=2.5.2.4265, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\extern\Python\Python.Runtime.dll</HintPath>
       <Private>False</Private>
@@ -49,6 +44,7 @@
       <Name>DynamoCore</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Libraries\DSCPython\DSCPython.csproj" />
     <ProjectReference Include="..\Libraries\PythonNodeModels\PythonNodeModels.csproj">
       <Project>{8872ca17-c10d-43b9-8393-5c5a57065eb0}</Project>
       <Name>PythonNodeModels</Name>
diff --git a/test/Libraries/DynamoPythonTests/CodeCompletionTests.cs b/test/Libraries/DynamoPythonTests/CodeCompletionTests.cs
@@ -326,7 +326,7 @@ public void CanFindAllTypeImports()
         [Category("UnitTests")]
         public void CanFindDifferentTypesOfImportsAndLoad()
         {
-            var str = "from itertools import *\nimport math\nfrom sys import callstats\n";
+            var str = "from itertools import *\nimport math\nfrom sys import exit\n";
 
             var completionProvider = new DSCPythonCodeCompletionProviderCore();
             try
@@ -339,7 +339,7 @@ public void CanFindDifferentTypesOfImportsAndLoad()
             Assert.AreEqual(3, completionProvider.ImportedTypes.Count);
             Assert.IsTrue(completionProvider.ScopeHasVariable("repeat"));
             Assert.IsTrue(completionProvider.ScopeHasVariable("math"));
-            Assert.IsTrue(completionProvider.ScopeHasVariable("callstats"));
+            Assert.IsTrue(completionProvider.ScopeHasVariable("exit"));
         }
 
         [Test]
diff --git a/test/Libraries/DynamoPythonTests/PythonEditTests.cs b/test/Libraries/DynamoPythonTests/PythonEditTests.cs
@@ -363,7 +363,7 @@ public void PythonNodeEnginePropertyChangeTest()
                 }
                 else if (pythonEngine == PythonEngineManager.CPython3EngineName)
                 {
-                    Assert.AreEqual("3.8.10", nodeValue);
+                    Assert.AreEqual("3.9.12", nodeValue);
                 }
             }
         }
@@ -439,11 +439,11 @@ public void TestWorkspaceWithMultiplePythonEngines()
 
             UpdatePythonEngineAndRun(pynode1, PythonEngineManager.CPython3EngineName);
             Assert.IsTrue(ViewModel.Model.CurrentWorkspace.HasUnsavedChanges);
-            AssertPreviewValue(pynode1.GUID.ToString("N"), "3.8.10");
+            AssertPreviewValue(pynode1.GUID.ToString("N"), "3.9.12");
 
             UpdatePythonEngineAndRun(pynode2, PythonEngineManager.CPython3EngineName);
             Assert.IsTrue(ViewModel.Model.CurrentWorkspace.HasUnsavedChanges);
-            AssertPreviewValue(pynode2.GUID.ToString("N"), new List<string> { "3.8.10", "3.8.10" });
+            AssertPreviewValue(pynode2.GUID.ToString("N"), new List<string> { "3.9.12", "3.9.12" });
         }
 
         [Test]
diff --git a/test/Libraries/IronPythonTests/IronPythonTests.csproj b/test/Libraries/IronPythonTests/IronPythonTests.csproj
@@ -24,7 +24,7 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Python.Runtime, Version=2.5.1.7, Culture=neutral, PublicKeyToken=null" />
+    <Reference Include="Python.Runtime, Version=2.5.2.4265, Culture=neutral, PublicKeyToken=null" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/test/Libraries/IronPythonTests/PythonEditTests.cs b/test/Libraries/IronPythonTests/PythonEditTests.cs
@@ -403,7 +403,7 @@ public void PythonNodeEnginePropertyChangeTest()
                 }
                 else if (pythonEngine == PythonEngineVersion.CPython3)
                 {
-                    Assert.AreEqual(nodeValue, "3.8.10");
+                    Assert.AreEqual(nodeValue, "3.9.12");
                 }
             }
         }
@@ -477,11 +477,11 @@ public void TestWorkspaceWithMultiplePythonEngines()
 
             UpdatePythonEngineAndRun(pynode1, PythonEngineVersion.CPython3);
             Assert.IsTrue(ViewModel.Model.CurrentWorkspace.HasUnsavedChanges);
-            AssertPreviewValue(pythonNode2GUID, new List<string> { "3.8.10", "2.7.9" });
+            AssertPreviewValue(pythonNode2GUID, new List<string> { "3.9.12", "2.7.9" });
 
             UpdatePythonEngineAndRun(pynode2, PythonEngineVersion.CPython3);
             Assert.IsTrue(ViewModel.Model.CurrentWorkspace.HasUnsavedChanges);
-            AssertPreviewValue(pythonNode2GUID, new List<string> { "3.8.10", "3.8.10" });
+            AssertPreviewValue(pythonNode2GUID, new List<string> { "3.9.12", "3.9.12" });
 
             UpdateEngineAndRunForAllPythonNodes(pythonNodes, PythonEngineVersion.IronPython2);
             Assert.IsTrue(ViewModel.Model.CurrentWorkspace.HasUnsavedChanges);
diff --git a/test/Libraries/IronPythonTests/PythonMigrationViewExtensionTests.cs b/test/Libraries/IronPythonTests/PythonMigrationViewExtensionTests.cs
@@ -467,12 +467,12 @@ public void WorkspaceWithMultiplePythonEnginesUpdatesCorrectlyViaContextHandler(
             SetEngineViaContextMenu(pynode1view, PythonEngineVersion.CPython3);
 
             Assert.IsTrue(ViewModel.Model.CurrentWorkspace.HasUnsavedChanges);
-            Assert.AreEqual(new List<string> { "3.8.10", "2.7.9" }, pynode2.CachedValue.GetElements().Select(x => x.Data));
+            Assert.AreEqual(new List<string> { "3.9.12", "2.7.9" }, pynode2.CachedValue.GetElements().Select(x => x.Data));
 
             SetEngineViaContextMenu(pynode2view, PythonEngineVersion.CPython3);
 
             Assert.IsTrue(ViewModel.Model.CurrentWorkspace.HasUnsavedChanges);
-            Assert.AreEqual(new List<string> { "3.8.10", "3.8.10" }, pynode2.CachedValue.GetElements().Select(x => x.Data));
+            Assert.AreEqual(new List<string> { "3.9.12", "3.9.12" }, pynode2.CachedValue.GetElements().Select(x => x.Data));
 
             SetEngineViaContextMenu(pynode1view, PythonEngineVersion.IronPython2);
             SetEngineViaContextMenu(pynode2view, PythonEngineVersion.IronPython2);
@@ -482,10 +482,10 @@ public void WorkspaceWithMultiplePythonEnginesUpdatesCorrectlyViaContextHandler(
             DispatcherUtil.DoEvents();
 
             Model.CurrentWorkspace.Undo();
-            Assert.AreEqual(new List<string> { "2.7.9", "3.8.10" }, pynode2.CachedValue.GetElements().Select(x => x.Data));
+            Assert.AreEqual(new List<string> { "2.7.9", "3.9.12" }, pynode2.CachedValue.GetElements().Select(x => x.Data));
             DispatcherUtil.DoEvents();
             Model.CurrentWorkspace.Undo();
-            Assert.AreEqual(new List<string> { "3.8.10", "3.8.10" }, pynode2.CachedValue.GetElements().Select(x => x.Data));
+            Assert.AreEqual(new List<string> { "3.9.12", "3.9.12" }, pynode2.CachedValue.GetElements().Select(x => x.Data));
             DispatcherUtil.DoEvents();
 
         }

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ public static object EvaluatePythonScript(`
`336`	`336`	`/// NOTE: Calling SetupPython multiple times will add the install location to the path many times,`
`337`	`337`	`/// potentially causing the environment variable to overflow.`
`338`	`338`	`/// </summary>`
`339`		`- private static void InstallPython()`
	`339`	`+ internal static void InstallPython()`
`340`	`340`	`{`
`341`	`341`	`if (!isPythonInstalled)`
`342`	`342`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ import clr`
`72`	`72`
`73`	`73`	`private object ExecutePythonScriptCode(string code)`
`74`	`74`	`{`
`75`		`- Python.Included.Installer.SetupPython().Wait();`
	`75`	`+ DSCPython.CPythonEvaluator.InstallPython();`
`76`	`76`
`77`	`77`	`if (!PythonEngine.IsInitialized)`
`78`	`78`	`{`
`@@ -376,6 +376,8 @@ public DSCPythonCodeCompletionProviderCore()`
`376`	`376`	`BasicVariableTypes.Add(Tuple.Create(LIST_VARIABLE, typeof(PyList)));`
`377`	`377`	`BasicVariableTypes.Add(Tuple.Create(DICT_VARIABLE, typeof(PyDict)));`
`378`	`378`
	`379`	`+ DSCPython.CPythonEvaluator.InstallPython();`
	`380`	`+`
`379`	`381`	`if (!PythonEngine.IsInitialized)`
`380`	`382`	`{`
`381`	`383`	`PythonEngine.Initialize();`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ public void PythonNodeEnginePropertyChangeTest()`
`363`	`363`	`}`
`364`	`364`	`else if (pythonEngine == PythonEngineManager.CPython3EngineName)`
`365`	`365`	`{`
`366`		`- Assert.AreEqual("3.8.10", nodeValue);`
	`366`	`+ Assert.AreEqual("3.9.12", nodeValue);`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`	`}`
`@@ -439,11 +439,11 @@ public void TestWorkspaceWithMultiplePythonEngines()`
`439`	`439`
`440`	`440`	`UpdatePythonEngineAndRun(pynode1, PythonEngineManager.CPython3EngineName);`
`441`	`441`	`Assert.IsTrue(ViewModel.Model.CurrentWorkspace.HasUnsavedChanges);`
`442`		`- AssertPreviewValue(pynode1.GUID.ToString("N"), "3.8.10");`
	`442`	`+ AssertPreviewValue(pynode1.GUID.ToString("N"), "3.9.12");`
`443`	`443`
`444`	`444`	`UpdatePythonEngineAndRun(pynode2, PythonEngineManager.CPython3EngineName);`
`445`	`445`	`Assert.IsTrue(ViewModel.Model.CurrentWorkspace.HasUnsavedChanges);`
`446`		`- AssertPreviewValue(pynode2.GUID.ToString("N"), new List<string> { "3.8.10", "3.8.10" });`
	`446`	`+ AssertPreviewValue(pynode2.GUID.ToString("N"), new List<string> { "3.9.12", "3.9.12" });`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`[Test]`