Changeset 8eb9043 in sasview

Timestamp:

Apr 9, 2017 3:35:25 AM (7 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57, 527a190

Parents:

dab94f6

git-author:

Jeff Krzywon <krzywon@…> (04/09/17 03:35:25)

git-committer:

krzywon <krzywon@…> (04/09/17 03:35:25)

Message:

Modify setup_exe.py to include all test data.

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()
@@ -269 +273 @@
 # Copying the images directory to the distribution directory.
 for f in findall(images_dir):
-    if not ".svn" in f:
-        data_files.append(("images", [f]))
+    data_files.append(("images", [f]))
 
 # Copying the HTML help docs
 for f in findall(media_dir):
-    if not ".svn" in f:
-        data_files.append(("media", [f]))
+    data_files.append(("media", [f]))
 
 # Copying the sample data user data
 for f in findall(test_1d_dir):
-    if not ".svn" in f:
-        data_files.append(("test\\1d_data", [f]))
-
-# Copying the sample data user data
+    data_files.append(("test\\1d_data", [f]))
 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
+    data_files.append(("test\\2d_data", [f]))
 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\\save_states", [f]))
+for f in findall(test_sesans_dir):
+    data_files.append(("test\\sesans_data", [f]))
+for f in findall(test_convertible_dir):
+    data_files.append(("test\\convertible_files", [f]))
+for f in findall(test_coord_dir):
+    data_files.append(("test\\coordinate_data", [f]))
+for f in findall(test_image_dir):
+    data_files.append(("test\\image_data", [f]))
+for f in findall(test_other_dir):
+    data_files.append(("test\\other_files", [f]))
 
 # Copying opencl include files