Minor commit before merging with master

PhonologicalCorpusTools · Dec 9, 2016 · 01ae5f7 · 01ae5f7
1 parent 0122ec8
commit 01ae5f7
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 32 deletions.
diff --git a/corpustools/command_line/pct.py b/corpustools/command_line/pct.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 import sys
 import os
+from multiprocessing import freeze_support
+from corpustools.gui.main import MainWindow,QApplicationMessaging
 
 if sys.platform.startswith('win'):
     if getattr(sys, 'frozen', False):
@@ -16,11 +18,7 @@ def flush(self):
         sys.stdout = FakeSTD()
         sys.stderr = FakeSTD()
 
-from multiprocessing import freeze_support
-from corpustools.gui.main import MainWindow,QApplicationMessaging
-
 def main():
-    freeze_support()
 
     app = QApplicationMessaging(sys.argv)
     if app.isRunning():
@@ -38,5 +36,6 @@ def main():
 
 
 if __name__ == '__main__':
+    freeze_support()
     main()
 
diff --git a/corpustools/multiprocessing.py b/corpustools/multiprocessing.py
@@ -1,5 +1,5 @@
 
-from multiprocessing import Process, Manager, Queue, cpu_count, Value, Lock, Pool, JoinableQueue
+from multiprocessing import Process, process, Manager, Queue, cpu_count, Value, Lock, Pool, JoinableQueue
 from queue import Empty, Full
 
 import time

diff --git a/cx_setup.py b/cx_setup.py
@@ -1,17 +1,16 @@
 import sys
 import os
 import scipy.special
-#from scipy import special
 import PyQt5
 from cx_Freeze import setup, Executable
 
 def readme():
     with open('README.md') as f:
         return f.read()
 
-
 ufuncs_path = scipy.special._ufuncs.__file__
-incl_files = [(ufuncs_path,os.path.split(ufuncs_path)[1]),('docs/build','html')]
+incl_files = [(ufuncs_path,os.path.split(ufuncs_path)[1]),('docs','html')]
+
 base = None
 if sys.platform == "win32":
     base = "Win32GUI"
@@ -23,18 +22,18 @@ def readme():
 exe_name = 'Phonological CorpusTools'
 
 shortcut_table = [
-    ("StartMenuShortcut",        # Shortcut
-     "ProgramMenuFolder",          # Directory_
-     "%s" % (exe_name,),           # Name
-     "TARGETDIR",              # Component_
-     "[TARGETDIR]pct.exe",# Target
-     None,                     # Arguments
-     None,                     # Description
-     None,                     # Hotkey
-     None,   # Icon
-     None,                     # IconIndex
-     None,                     # ShowCmd
-     'TARGETDIR'               # WkDir
+    ("StartMenuShortcut",       # Shortcut
+     "ProgramMenuFolder",       # Directory_
+     "%s" % (exe_name,),        # Name
+     "TARGETDIR",               # Component_
+     "[TARGETDIR]pct.exe",      # Target
+     None,                      # Arguments
+     None,                      # Description
+     None,                      # Hotkey
+     None,                      # Icon
+     None,                      # IconIndex
+     None,                      # ShowCmd
+     'TARGETDIR'                # WkDir
      )
     ]
 
@@ -64,9 +63,10 @@ def readme():
                             "scipy.special",
                             "scipy.special._ufuncs_cxx",
                             "scipy.sparse.csgraph._validation",
-                            #"acousticsim",
+                            "scipy.spatial",
                             "textgrid",
-                            "sys"]
+                            "sys",
+                            "multiprocessing"]
                             }
 
 msi_data = {"Shortcut": shortcut_table}
@@ -115,13 +115,14 @@ def readme():
                 'corpustools.symbolsim',
                 'corpustools.neighdens',
                 'corpustools.mutualinfo',
-                'corpustools.phonoprob'],
-      executables = [Executable('corpustools/command_line/pct.py',
+                'corpustools.phonoprob',
+                ],
+      executables = [Executable('corpustools/command_line/pct.pyw',
                             #targetName = 'pct',
                             base=base,
                             #shortcutDir=r'[StartMenuFolder]\%s' % group_name,
                             #shortcutName=exe_name,
-                            #icon='docs/images/icon.icns'
+                            #icon='docs/images/favicon.png'
                             )],
       options={
           'bdist_msi': bdist_msi_options,

diff --git a/docs/images/favicon.icns b/docs/images/favicon.icns
diff --git a/docs/images/favicon.png b/docs/images/favicon.png
diff --git a/esk_setup.py b/esk_setup.py
@@ -5,7 +5,8 @@
 import os
 import sys
 from glob import glob
-
+from corpustools import acousticsim
+from corpustools.corpus.io import textgrid
 
 ufuncs_path = scipy.special._ufuncs.__file__
 doc_files = dict()
@@ -51,7 +52,8 @@
                             "scipy.sparse.csgraph._validation",
                             "acousticsim",
                             "textgrid",
-                            "sys"],
+                            "sys",
+                            "multiprocessing"],
                 "excludes":[
                         'matplotlib',
                         "tcl",
@@ -72,8 +74,8 @@
                             #targetName = 'pct',
                             gui_only=True,
                             #shortcutDir=r'[StartMenuFolder]\%s' % group_name,
-                            #shortcutName=exe_name,
-                            icon='docs/images/logo.ico'
+                            shortcutName=exe_name,
+                            #icon='docs/images/favicon.png'
                             )
 
 build_exe_options = {"excludes": [
@@ -102,10 +104,11 @@
                             "scipy.sparse.csgraph._validation",
                             "acousticsim",
                             "textgrid",
-                            "sys"]
+                            "sys",
+                            "multiprocessing"]
                             }
 
-bdist_mac_options = {'iconfile':'docs/images/icon.icns',
+bdist_mac_options = {'iconfile':'docs/images/favicon.icns',
                     'qt_menu_nib':'/opt/local/share/qt5/plugins/platforms',
                     'bundle_name':'Phonological CorpusTools',
                     #'include_frameworks':["/Library/Frameworks/Tcl.framework",
@@ -129,7 +132,8 @@
                 'corpustools.symbolsim',
                 'corpustools.neighdens',
                 'corpustools.mutualinfo',
-                'corpustools.phonoprob',],
+                'corpustools.phonoprob',
+                'corpustoools.acousticsim'],
         data_files = incl_files,
         options={
                 #"bdist_mac_options":bdist_mac_options,