Merge pull request #66 from Martin-Molinero/bug-fix-collection-handling

Bug fix collection handling

Author: Martin-Molinero

src/embed_tests/QCTest.cs

@@ -9,6 +9,7 @@ namespace Python.EmbeddingTest
 {
     class QCTests
     {
+        private static dynamic containsTest;
         private static dynamic module;
         private static string testModule = @"
 from clr import AddReference
@@ -22,13 +23,20 @@ def TestA(self):
             return True
         except:
             return False
+
+def ContainsTest(key, collection):
+    if key in collection.Keys:
+        return True
+    return False
 ";
 
         [OneTimeSetUp]
         public void Setup()
         {
             PythonEngine.Initialize();
-            module = PyModule.FromString("module", testModule).GetAttr("PythonModule").Invoke();
+            var pyModule = PyModule.FromString("module", testModule);
+            containsTest = pyModule.GetAttr("ContainsTest");
+            module = pyModule.GetAttr("PythonModule").Invoke();
         }
 
         [OneTimeTearDown]
@@ -46,6 +54,14 @@ public void ParamTest()
             var output = (bool)module.TestA();
             Assert.IsTrue(output);
         }
+
+        [TestCase("AAPL", false)]
+        [TestCase("SPY", true)]
+        public void ContainsTest(string key, bool expected)
+        {
+            var dic = new Dictionary<string, object> { { "SPY", new object() } };
+            Assert.AreEqual(expected, (bool)containsTest(key, dic));
+        }
     }
 
     public class Algo

src/perf_tests/Python.PerformanceTests.csproj

@@ -13,7 +13,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />
-    <PackageReference Include="quantconnect.pythonnet" Version="2.0.13" GeneratePathProperty="true">
+    <PackageReference Include="quantconnect.pythonnet" Version="2.0.14" GeneratePathProperty="true">
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>
   </ItemGroup>
@@ -25,7 +25,7 @@
   </Target>
 
   <Target Name="CopyBaseline" AfterTargets="Build">
-    <Copy SourceFiles="$(NuGetPackageRoot)quantconnect.pythonnet\2.0.13\lib\net5.0\Python.Runtime.dll" DestinationFolder="$(OutDir)baseline" />
+    <Copy SourceFiles="$(NuGetPackageRoot)quantconnect.pythonnet\2.0.14\lib\net5.0\Python.Runtime.dll" DestinationFolder="$(OutDir)baseline" />
   </Target>
 
   <Target Name="CopyNewBuild" AfterTargets="Build">

src/runtime/InteropConfiguration.cs

@@ -20,8 +20,9 @@ public static InteropConfiguration MakeDefault()
             {
                 PythonBaseTypeProviders =
                 {
-                    DefaultBaseTypeProvider.Instance,
-                    new CollectionMixinsProvider(new Lazy<PyObject>(() => Py.Import("clr._extras.collections"))),
+                    DefaultBaseTypeProvider.Instance
+                    // see https://github.com/pythonnet/pythonnet/issues/1785
+                    // new CollectionMixinsProvider(new Lazy<PyObject>(() => Py.Import("clr._extras.collections"))),
                 },
             };
         }

src/runtime/Properties/AssemblyInfo.cs

@@ -4,5 +4,5 @@
 [assembly: InternalsVisibleTo("Python.EmbeddingTest, PublicKey=00240000048000009400000006020000002400005253413100040000110000005ffd8f49fb44ab0641b3fd8d55e749f716e6dd901032295db641eb98ee46063cbe0d4a1d121ef0bc2af95f8a7438d7a80a3531316e6b75c2dae92fb05a99f03bf7e0c03980e1c3cfb74ba690aca2f3339ef329313bcc5dccced125a4ffdc4531dcef914602cd5878dc5fbb4d4c73ddfbc133f840231343e013762884d6143189")]
 [assembly: InternalsVisibleTo("Python.Test, PublicKey=00240000048000009400000006020000002400005253413100040000110000005ffd8f49fb44ab0641b3fd8d55e749f716e6dd901032295db641eb98ee46063cbe0d4a1d121ef0bc2af95f8a7438d7a80a3531316e6b75c2dae92fb05a99f03bf7e0c03980e1c3cfb74ba690aca2f3339ef329313bcc5dccced125a4ffdc4531dcef914602cd5878dc5fbb4d4c73ddfbc133f840231343e013762884d6143189")]
 
-[assembly: AssemblyVersion("2.0.13")]
-[assembly: AssemblyFileVersion("2.0.13")]
+[assembly: AssemblyVersion("2.0.14")]
+[assembly: AssemblyFileVersion("2.0.14")]

src/runtime/Python.Runtime.csproj

@@ -5,7 +5,7 @@
     <RootNamespace>Python.Runtime</RootNamespace>
     <AssemblyName>Python.Runtime</AssemblyName>
     <PackageId>QuantConnect.pythonnet</PackageId>
-    <Version>2.0.13</Version>
+    <Version>2.0.14</Version>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <RepositoryUrl>https://github.com/pythonnet/pythonnet</RepositoryUrl>