Merge pull request QuantConnect#35 from Martin-Molinero/bug-initialization-hang

jaredbroad · web-flow · commit 9e29755c54e6 · 2019-09-10T07:46:36.000-07:00
Fix initialization hang
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.5.23
+current_version = 1.0.5.24
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
 serialize = 
 	{major}.{minor}.{patch}.{release}{dev}
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: pythonnet
-  version: "1.0.5.23"
+  version: "1.0.5.24"
 
 build:
   skip: True  # [not win]
diff --git a/setup.py b/setup.py
@@ -485,7 +485,7 @@ def run(self):
 
 setup(
     name="pythonnet",
-    version="1.0.5.23",
+    version="1.0.5.24",
     description=".Net and Mono integration for Python",
     url='https://pythonnet.github.io/',
     license='MIT',
diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs
@@ -25,4 +25,4 @@
 // Version Information. Keeping it simple. May need to revisit for Nuget
 // See: https://codingforsmarties.wordpress.com/2016/01/21/how-to-version-assemblies-destined-for-nuget/
 // AssemblyVersion can only be numeric
-[assembly: AssemblyVersion("1.0.5.23")]
+[assembly: AssemblyVersion("1.0.5.24")]
diff --git a/src/clrmodule/ClrModule.cs b/src/clrmodule/ClrModule.cs
@@ -53,7 +53,7 @@ public static void initclr()
         {
 #if USE_PYTHON_RUNTIME_VERSION
             // Has no effect until SNK works. Keep updated anyways.
-            Version = new Version("1.0.5.23"),
+            Version = new Version("1.0.5.24"),
 #endif
             CultureInfo = CultureInfo.InvariantCulture
         };
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -344,6 +344,12 @@ internal static void ScanAssembly(Assembly assembly)
             // gather a list of all of the namespaces contributed to by
             // the assembly.
 
+            // skip this assembly, it causes 'GetTypes' call to hang
+            if (assembly.FullName.StartsWith("System.Windows.Forms"))
+            {
+                return;
+            }
+
             Type[] types = assembly.GetTypes();
             foreach (Type t in types)
             {
diff --git a/src/runtime/resources/clr.py b/src/runtime/resources/clr.py
@@ -2,7 +2,7 @@
 Code in this module gets loaded into the main clr module.
 """
 
-__version__ = "1.0.5.23"
+__version__ = "1.0.5.24"
 
 
 class clrproperty(object):

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public static void initclr()`
`53`	`53`	`{`
`54`	`54`	`#if USE_PYTHON_RUNTIME_VERSION`
`55`	`55`	`// Has no effect until SNK works. Keep updated anyways.`
`56`		`- Version = new Version("1.0.5.23"),`
	`56`	`+ Version = new Version("1.0.5.24"),`
`57`	`57`	`#endif`
`58`	`58`	`CultureInfo = CultureInfo.InvariantCulture`
`59`	`59`	`};`