add new mac library

Author: stephanie

make.py

@@ -153,17 +153,46 @@ def run_pyinstaller(console=False):
             os.system(command)
         else:
             ## Non Console Version
+<<<<<<< Updated upstream
             command = """pyinstaller --clean --distpath=%s --workpath=%s --specpath=%s --noupx --icon=%s --version-file=%s --onefile --noconsole --noconfirm  %s""" % (WIN_DIR, WORK_DIR, WIN_DIR, WIN_ICON_FILE, VERSION_FILE, APP_FILE)
+=======
+            command = """pyinstaller --clean --distpath=%s --workpath=%s --specpath=%s --noupx --icon=%s --version-file=%s --onefile --noconsole --noconfirm  %s""" % (
+            WIN_DIR, WORK_DIR, WIN_DIR, WIN_ICON_FILE, VERSION_FILE, APP_FILE)
+
+
+>>>>>>> Stashed changes
             os.system(command)
     except Exception as e:
         print (e)
         return False
 
 def mac_pyinstaller():
     try:
-        os.system("""pyinstaller --clean --distpath=%s --workpath=%s --specpath=%s --upx-dir=%s --icon=%s --version-file=%s --windowed --onefile --noconfirm """ % (MAC_DIST_DIR, MAC_WORK_DIR, MAC_DIR,BASE_DIR,  MAC_ICON_FILE, VERSION_FILE, APP_FILE)
+
+
+        #
+        # os.system('pyinstaller '
+        #     '--clean '
+        #     '--distpath=%s ' % MAC_DIST_DIR +
+        #     '--workpath=%s ' % MAC_WORK_DIR +
+        #     '--specpath=%s ' % MAC_DIR +
+        #     '--upx-dir=%s ' % BASE_DIR +
+        #     '--icon=%s ' % MAC_ICON_FILE +
+        #     '--version-file=%s ' % VERSION_FILE +
+        #     '--windowed '#'--onefile '
+        #     '--noconfirm ' + APP_FILE)
+
+        command = """pyinstaller --clean --distpath=%s --workpath=%s --specpath=%s --noupx --icon=%s --version-file=%s --onefile --noconsole --noconfirm  %s""" % (
+            MAC_DIST_DIR, MAC_WORK_DIR, MAC_DIR, MAC_ICON_FILE, VERSION_FILE, APP_FILE)
+
+        os.system(command)
+
         #copy "libwx_osx_cocoau-3.0.0.0.0.dylib"
-        os.system("cp /anaconda/envs/odmtools/lib/libwx_osx_cocoau-3.0.0.0.0.dylib %s" % os.path.join(APP_DIR, "Contents/MacOS/"))
+        copycommand = "cp /anaconda/envs/odmtools/lib/libwx_osx_cocoau-3.0.0.0.0.dylib %s" % os.path.join(APP_DIR, "Contents/MacOS/")
+        os.system(copycommand)
+        copycommand = "cp /anaconda/envs/odmtools/lib/libmkl_avx2.dylib %s" % os.path.join(APP_DIR, "Contents/MacOS/")
+        os.system(copycommand)
+
 
         return True
     except Exception as e:

setup/Mac/ODMTools.packproj

@@ -566,11 +566,9 @@
 						<key>IFPkgDescriptionDescription</key>
 						<string></string>
 						<key>IFPkgDescriptionTitle</key>
-
-						<string>ODMTools_v1.2.8</string>
+						<string>ODMTools_v1.2.9</string>
 						<key>IFPkgDescriptionVersion</key>
-						<string>1.2.8 Beta</string>
-
+						<string>1.2.9 Beta</string>
 					</dict>
 				</dict>
 				<key>Display Information</key>
@@ -586,7 +584,7 @@
 					<key>CFBundleName</key>
 					<string>ODMTools</string>
 					<key>CFBundleShortVersionString</key>
-					<string>1.2.8</string>
+					<string>1.2.9</string>
 				</dict>
 				<key>Options</key>
 				<dict>
@@ -621,7 +619,7 @@
 		<key>IFPkgFlagPackageSelection</key>
 		<integer>0</integer>
 		<key>Name</key>
-		<string>ODMTools_v1.2.8-beta_Mac_installer</string>
+		<string>ODMTools_v1.2.9-beta_Mac_installer</string>
 		<key>Status</key>
 		<integer>1</integer>
 		<key>Type</key>

setup/Mac/ODMTools.spec

@@ -5,33 +5,24 @@ block_cipher = None
 
 a = Analysis(['/Users/stephanie/DEV/ODMToolsPython/ODMTools.py'],
              pathex=['/Users/stephanie/DEV/ODMToolsPython/setup/Mac'],
-             binaries=None,
-             datas=None,
              hiddenimports=[],
-             hookspath=['/Users/stephanie/DEV/ODMToolsPython/setup/hooks'],
+             hookspath=None,
              runtime_hooks=None,
-             excludes=['PyQt4', 'PyQt4.QtCore', 'PyQt4.QtGui'],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
+             excludes=None,
              cipher=block_cipher)
-pyz = PYZ(a.pure, a.zipped_data,
+pyz = PYZ(a.pure,
              cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
-          exclude_binaries=True,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
           name='ODMTools',
           debug=False,
-          strip=False,
-          upx=True,
-          console=False , version='/Users/stephanie/DEV/ODMToolsPython/setup/version.txt', icon='/Users/stephanie/DEV/ODMToolsPython/odmtools/common/icons/ODMTools.icns')
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=False,
-               name='ODMTools')
-app = BUNDLE(coll,
+          strip=None,
+          upx=False,
+          console=False , version='/Users/stephanie/DEV/ODMToolsPython/setup/version.txt', icon='odmtools/common/icons/ODMTools.icns')
+app = BUNDLE(exe,
              name='ODMTools.app',
-             icon='/Users/stephanie/DEV/ODMToolsPython/odmtools/common/icons/ODMTools.icns',
+             icon='odmtools/common/icons/ODMTools.icns',
              bundle_identifier=None)

setup/hooks/hook-wx.lib.pubsub.py

@@ -0,0 +1,7 @@
+import os
+
+def hook(mod):
+    pth = str(mod.__path__[0])
+    if os.path.isdir(pth):
+        mod.__path__.append(os.path.normpath(os.path.join(pth, 'kwargs')))
+    return mod