From: <th...@us...> - 2017-08-01 13:55:51
|
Revision: 769 http://sourceforge.net/p/py2exe/svn/769 Author: theller Date: 2017-08-01 13:55:48 +0000 (Tue, 01 Aug 2017) Log Message: ----------- Add more MKL files to numpy_core hook, bump py2exe version. Modified Paths: -------------- trunk/py2exe-3/py2exe/__init__.py trunk/py2exe-3/py2exe/boot_ctypes_com_server.py trunk/py2exe-3/py2exe/hooks.py Modified: trunk/py2exe-3/py2exe/__init__.py =================================================================== --- trunk/py2exe-3/py2exe/__init__.py 2017-01-04 16:13:11 UTC (rev 768) +++ trunk/py2exe-3/py2exe/__init__.py 2017-08-01 13:55:48 UTC (rev 769) @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """py2exe package """ -__version__ = "0.9.2.5" +__version__ = "0.9.2.7" from .patch_distutils import patch_distutils Modified: trunk/py2exe-3/py2exe/boot_ctypes_com_server.py =================================================================== --- trunk/py2exe-3/py2exe/boot_ctypes_com_server.py 2017-01-04 16:13:11 UTC (rev 768) +++ trunk/py2exe-3/py2exe/boot_ctypes_com_server.py 2017-08-01 13:55:48 UTC (rev 769) @@ -53,7 +53,7 @@ def get_classes(module): return [ob for ob in module.__dict__.values() - if hasattr(ob, "_reg_progid_") + if hasattr(ob, "_reg_progid_") and ob._reg_progid_ is not None ] def build_class_map(): Modified: trunk/py2exe-3/py2exe/hooks.py =================================================================== --- trunk/py2exe-3/py2exe/hooks.py 2017-01-04 16:13:11 UTC (rev 768) +++ trunk/py2exe-3/py2exe/hooks.py 2017-08-01 13:55:48 UTC (rev 769) @@ -485,7 +485,9 @@ numpy_core_path = os.path.dirname(module.__loader__.path) #add mkl dlls from numpy.core, if present from os import listdir - dlls = [os.path.join(numpy_core_path,mkl) for mkl in listdir(numpy_core_path) if mkl.startswith('mkl_')] + dlls = [os.path.join(numpy_core_path,mkl) + for mkl in listdir(numpy_core_path) + if mkl.startswith('mkl_') or mkl in ['libmmd.dll', 'libifcoremd.dll', 'libiomp5md.dll']] for dll in dlls: finder.add_dll(dll) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |