Changes in / [6a6d687:038ccfe6] in sasview

File:

• sasview/setup_exe.py (modified) (6 diffs)

sasview/setup_exe.py

@@ -231 +231 @@
 images_dir = os.path.join(path, "images")
 test_dir = os.path.join(path, "test")
-test_1d_dir = os.path.join(path, "test\\1d_data")
-test_2d_dir = os.path.join(path, "test\\2d_data")
-test_save_dir = os.path.join(path, "test\\save_states")
-test_upcoming_dir = os.path.join(path, "test\\upcoming_formats")
 
 matplotlibdatadir = matplotlib.get_data_path()
@@ -294 +290 @@
 
 # Copying the sample data user data
-for f in findall(test_1d_dir):
+for f in findall(test_dir):
     if not ".svn" in f:
-        data_files.append(("test\\1d_data", [f]))
-
-# Copying the sample data user data
-for f in findall(test_2d_dir):
-    if not ".svn" in f:
-        data_files.append(("test\\2d_data", [f]))
-
-# Copying the sample data user data
-for f in findall(test_save_dir):
-    if not ".svn" in f:
-        data_files.append(("test\\save_states", [f]))
-
-# Copying the sample data user data
-for f in findall(test_upcoming_dir):
-    if not ".svn" in f:
-        data_files.append(("test\\upcoming_formats", [f]))
-
+        data_files.append(("test", [f]))
 
 # See if the documentation has been built, and if so include it.
@@ -330 +310 @@
     # install the MSVC 9 runtime dll's into the application folder
     data_files.append(("Microsoft.VC90.CRT", py26MSdll_x86))
+
 
 # NOTE:
@@ -354 +335 @@
 packages.append('periodictable.core') # not found automatically
 #packages.append('IPython')
-includes = ['site', 'lxml._elementpath', 'lxml.etree', 'zmq.backend.cython']
+includes = ['site', 'lxml._elementpath', 'lxml.etree']
 
 # Exclude packages that are not needed but are often found on build systems
-excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip', 'pytz', 'zmq.libzmq']
+excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip', 'pytz']
 
 
@@ -372 +353 @@
     # accidental links to msys/cygwin binaries; shouldn't be needed
     'cygwin1.dll',
-    'libzmq.pyd'
     ]
 
@@ -390 +370 @@
 #initialize category stuff
 #from sas.guiframe.CategoryInstaller import CategoryInstaller
-#CategoryInstaller.check_install(s)
-
-sys.setrecursionlimit(10000)
+#CategoryInstaller.check_install()
 
 setup(