Changeset 5a313a3 in sasview

Timestamp:

Aug 14, 2012 6:00:38 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

230cd32

Parents:

17574ae

Message:

moving model img files to media/img/

Files:

• sansmodels/src/sans/models/__init__.py (modified) (1 diff)
• setup.py (modified) (1 diff)

sansmodels/src/sans/models/__init__.py

@@ -46 +46 @@
     path = get_data_path(media="media")
     for f in findall(path):
-        data_files.append(('media/models_media', [f]))
+        if os.path.isfile(f):
+            data_files.append(('media/models_media', [f]))
+    path_img = get_data_path(media=os.path.join("media","img"))
+    for f in findall(path_img):
+        data_files.append(('media/models_media/img', [f]))
     return data_files

setup.py

@@ -271 +271 @@
 package_dir["sans.models.sans_extension"] = os.path.join("sansmodels", "src", "sans", "models", "sans_extension")
             
-package_data['sans.models'] = [os.path.join('media', "*")]
+package_data['sans.models'] = [os.path.join('media', "*.*")]
+package_data['sans.models'] += [os.path.join('media','img', "*.*")]
+
 packages.extend(["sans","sans.models","sans.models.sans_extension"])