Changeset 9ccf580 in sasmodels

Timestamp:

Apr 27, 2016 10:12:39 AM (9 years ago)

Author:

piotr

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

fb69211

Parents:

29464ba

Message:

Attempt at making top level models directory with automatically generated models. Added target directory so the installer acts upon it and modified relevant search paths.

Files:

• models/__init__.py (added)
• sasmodels/models/__init__.py (modified) (1 diff)
• setup.py (modified) (1 diff)

sasmodels/models/__init__.py

@@ -55 +55 @@
 
     # Add precompiled models dlls to the top level directory "models"
-    path_img = get_data_path(media=os.path.join("sasmodels","sasmodels","models","dll"))
+    path_img = get_data_path(media=os.path.join("..", "..", "models"))
     is_list = findall(path_img)
     for f in is_list:

setup.py

@@ -9 +9 @@
     'sasmodels.models': ['*.c','lib/*.c'],
     'sasmodels': ['*.c'],
-    'sasmodels.models.dll': ['*.so'],
+    'models': ['*.so'],
 }
 required = []