Changeset 4551598 in sasview

Timestamp:

Apr 4, 2017 12:43:09 PM (8 years ago)

Author:

krzywon

Children:

73c672f

Parents:

f68d503

git-author:

Jeff Krzywon <krzywon@…> (04/04/17 12:43:09)

git-committer:

krzywon <krzywon@…> (04/04/17 12:43:09)

Message:

Modify setup_exe.py to integrate all test data folders into the windows build. see #918

File:

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

sasview/setup_exe.py

@@ -179 +179 @@
 test_1d_dir = os.path.join(path, "test\\1d_data")
 test_2d_dir = os.path.join(path, "test\\2d_data")
+test_sesans_dir = os.path.join(path, "test\\sesans_data")
+test_convertible_dir = os.path.join(path, "test\\convertible_data")
 test_save_dir = os.path.join(path, "test\\save_states")
-test_upcoming_dir = os.path.join(path, "test\\upcoming_formats")
+test_coord_dir = os.path.join(path, "test\\coordinate_data")
+test_image_dir = os.path.join(path, "test\\image_data")
+test_other_dir = os.path.join(path, "test\\other_files")
 
 matplotlibdatadir = matplotlib.get_data_path()
@@ -293 +297 @@
 
 # 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]))
+for f in findall(test_sesans_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\sesans_data", [f]))
+
+# Copying the sample data user data
+for f in findall(test_convertible_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\convertible_files", [f]))
+
+# Copying the sample data user data
+for f in findall(test_coord_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\coordinate_data", [f]))
+
+# Copying the sample data user data
+for f in findall(test_image_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\image_data", [f]))
+
+# Copying the sample data user data
+for f in findall(test_other_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\other_files", [f]))
 
 # Copying opencl include files